Source release 17.1.0

cdm/cdm.gyp

@@ -1,5 +1,5 @@
 # Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-# source code may only be used and distributed under the Widevine Master License
+# source code may only be used and distributed under the Widevine License
 # Agreement.
 #
 # Refer to the distribution package's integration guide
@@ -13,17 +13,16 @@
     'core.gypi',
     'util.gypi',
   ],    # Get list of core source files.
-  'conditions': [
-    ['protobuf_config=="source"', {
-      # Include protobuf targets used by protobuf_config=='source'
-      'includes': ['../third_party/protobuf.gypi'],
-    }],
-  ],  # conditions
+  'variables': {
+    'has_dual_key%': 'false',
+  },
   'targets': [
     {
+      'toolsets' : [ 'target' ],
       'target_name': 'license_protocol',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'hard_dependency': 1,
       'includes': ['../third_party/protoc.gypi'],
       'sources': [
         '../core/src/license_protocol.proto',
@@ -33,9 +32,11 @@
       },
     },
     {
+      'toolsets' : [ 'target' ],
       'target_name': 'device_files',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'hard_dependency': 1,
       'includes': ['../third_party/protoc.gypi'],
       'sources': ['../core/src/device_files.proto',],
       'variables': {
@@ -43,9 +44,11 @@
       },
     },
     {
+      'toolsets' : [ 'target' ],
       'target_name': 'metrics_proto',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'hard_dependency': 1,
       'includes': ['../third_party/protoc.gypi'],
       'sources': ['../metrics/src/wv_metrics.proto',],
       'variables': {
@@ -53,17 +56,22 @@
       },
     },
     {
+      'toolsets' : [ 'target' ],
       'target_name': 'widevine_utils',
       'type': 'static_library',
+      'standalone_static_library': 1,
+      'hard_dependency': 1,
       'include_dirs': [
         '../util/include',
       ],
       'sources': [ '<@(wvutil_sources)'],
     },
     {
+      'toolsets' : [ 'target' ],
       'target_name': 'widevine_cdm_core',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'hard_dependency': 1,
       'dependencies': [
         'device_files',
         'license_protocol',
@@ -104,6 +112,16 @@
           'sources': [
             '../core/src/privacy_crypto_<(privacy_crypto_impl).cpp',
           ],
+          'conditions': [
+            ['privacy_crypto_impl=="apple"', {
+              'link_settings': {
+                'libraries': [
+                  '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+                  '$(SDKROOT)/System/Library/Frameworks/Security.framework',
+                ],
+              },
+            }],
+          ],
         }],  # end else
         ['oemcrypto_adapter_type=="dynamic"', {
           'sources': [
@@ -112,14 +130,21 @@
         }],
         ['oemcrypto_adapter_type=="static"', {
           'sources': [
-          '../core/src/oemcrypto_adapter_static.cpp',
+            '../core/src/oemcrypto_adapter_static.cpp',
           ],
         }],
-        # TODO(b/139814713): For testing and internal use only.
-        ['oemcrypto_adapter_type=="static_v15"', {
+        ['oemcrypto_adapter_type=="static_v16"', {
           'sources': [
             '../core/src/oemcrypto_adapter_static.cpp',
-            '../core/src/oemcrypto_adapter_static_v16.cpp',
+            '../core/src/oemcrypto_adapter_static_v17.cpp',
+          ],
+        }],
+        ['has_dual_key=="true"', {
+          'defines': ['HAS_DUAL_KEY'],
+        }],
+        ['support_ota_keybox_functions=="false"', {
+          'sources': [
+            '../core/src/oemcrypto_ota_stubs.cpp',
           ],
         }],
       ],
@@ -128,6 +153,7 @@
       # This is the widevine_ce_cdm built as a static library. This name does
       # not mean that it uses oemcrypto's static adapter. Control over which
       # adapter is used comes from the settings file for the platform.
+      'toolsets' : [ 'target' ],
       'target_name': 'widevine_ce_cdm_static',
       'type': 'static_library',
       'standalone_static_library': 1,
@@ -167,6 +193,7 @@
       ],
     },  # widevine_cdm_static target
     {
+      'toolsets' : [  'target' ],
       'target_name': 'widevine_ce_cdm_shared',
       'type': 'shared_library',
       'dependencies': [
@@ -179,6 +206,7 @@
       },
     },
     {
+      'toolsets' : [ 'target' ],
       'target_name': 'dummy',
       'type': 'none',
     },