Source release 14.1.0

cdm/cdm.gyp

@@ -1,7 +1,9 @@
-# Copyright 2015 Google Inc. All Rights Reserved.
+# Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+#source code may only be used and distributed under the Widevine Master License
+#Agreement.
 #
 # Refer to the distribution package's integration guide
-# (Widevine_CE_CDM_IntegrationGuide_v3.2.x.pdf) for information about
+# (Widevine_CE_CDM_IntegrationGuide_x.x.x.pdf) for information about
 # setting up your system, performing the build, and using/testing
 # the build targets.
 
@@ -106,12 +108,14 @@
         '../metrics/include',
         '../oemcrypto/include',
         '../third_party/jsmn',
+        '../util/include',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../core/include',
           '../metrics/include',
           '../oemcrypto/include',
+          '../util/include',
         ],
       },
       'sources': [
@@ -138,6 +142,7 @@
       'target_name': 'widevine_ce_cdm_static',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'hard_dependency': 1,
       'dependencies': [
         'widevine_cdm_core',
         'device_files',