From 6fa4e50d60baa301ee6abc3d76a5df73ffd0e872 Mon Sep 17 00:00:00 2001
From: "John W. Bruce" <juce@google.com>
Date: Wed, 25 Jul 2018 10:53:13 -0700
Subject: [PATCH] Source release 14.1.1

---
 CHANGELOG.md                        | 6 ++++++
 README.md                           | 4 ++--
 cdm/include/cdm_version.h           | 2 +-
 cdm/src/cdm.cpp                     | 2 +-
 third_party/boringssl/boringssl.gyp | 2 +-
 third_party/xcode_host.gypi         | 4 ----
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7b9039b..667bc6b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 [TOC]
 
+## 14.1.1 (2018-07-25)
+
+Bugfixes:
+  - A crash that could occur in CdmSession when destroying a CDM instance has
+    been fixed.
+
 ## 14.1.0 (2018-06-29)
 
 Features:
diff --git a/README.md b/README.md
index a764166c..2b5fb53d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Widevine CE CDM 14.1.0
+# Widevine CE CDM 14.1.1
 
-Released 2018-06-29
+Released 2018-07-25
 
 ## Getting started
 
diff --git a/cdm/include/cdm_version.h b/cdm/include/cdm_version.h
index d0517767..cf43c86b 100644
--- a/cdm/include/cdm_version.h
+++ b/cdm/include/cdm_version.h
@@ -1,3 +1,3 @@
 // Widevine CE CDM Version
-#define CDM_VERSION "14.1.0"
+#define CDM_VERSION "14.1.1"
 #define EME_VERSION "https://www.w3.org/TR/2017/REC-encrypted-media-20170918"
diff --git a/cdm/src/cdm.cpp b/cdm/src/cdm.cpp
index f7f1f9e0..94af2146 100644
--- a/cdm/src/cdm.cpp
+++ b/cdm/src/cdm.cpp
@@ -242,10 +242,10 @@ class CdmImpl : public Cdm,
 
   IEventListener* listener_;
   bool policy_timer_enabled_;
+  PropertySet property_set_;
 
   FileSystem file_system_;
   CdmEngine cdm_engine_;
-  PropertySet property_set_;
   CdmAppParameterMap app_parameters_;
 
   struct SessionMetadata {
diff --git a/third_party/boringssl/boringssl.gyp b/third_party/boringssl/boringssl.gyp
index d4ed1901..aaab557d 100644
--- a/third_party/boringssl/boringssl.gyp
+++ b/third_party/boringssl/boringssl.gyp
@@ -103,7 +103,7 @@
                 }],
               ],
             }],
-            ['OS=="mac"', {
+            ['OS=="osx"', {
               'conditions': [
                 ['asm_target_arch=="x86"', {
                   'sources': [
diff --git a/third_party/xcode_host.gypi b/third_party/xcode_host.gypi
index c5af32bd..f08c7967 100644
--- a/third_party/xcode_host.gypi
+++ b/third_party/xcode_host.gypi
@@ -7,9 +7,5 @@
 
 {
   'xcode_settings': {
-    'VALID_ARCHS': 'i386 x86_64',
-    'IPHONEOS_DEPLOYMENT_TARGET': '',
-    'TARGETED_DEVICE_FAMILY': '',
-    'SDKROOT': '',
   },
 }