Source release 16.2.0

cdm/cdm.gyp

@@ -1,6 +1,6 @@
 # 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.
+# 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_x.x.x.pdf) for information about
@@ -8,59 +8,11 @@
 # the build targets.
 
 {
-  'variables': {
-    # Override this to indicate what CPU architecture's assembly-language files
-    # should be used when building assembly language files. Or, set it to
-    # "none" to turn off the use of assembly language. The default is "none" for
-    # compatibility, but we strongly recommend overriding this value to
-    # improve performance. Turning it off or leaving it turned off is not
-    # recommended unless your CPU architecture is unsupported or you are using
-    # a tool that does not play nice with assembly language, like Address
-    # Sanitizer.
-    #
-    # Valid values are:
-    # * x86
-    # * x86-64
-    # * arm
-    # * arm64
-    # * ppc64
-    # * none
-    'asm_target_arch%': 'none',
-
-    # When building on Windows, we have to use the NASM assembler.  By default
-    # we disable assembly on Windows since this is usually not installed.  You
-    # can override it with these variables.
-    'has_nasm%': 'false',
-    'nasm_path%': 'nasm.exe',
-
-    # Override this only if you have an alternative privacy crypto
-    # implementation other than the default. This should nearly always be left
-    # alone. If set to 'dummy', the CDM will compile, but privacy mode in the
-    # CDM will fail.
-    'privacy_crypto_impl%': 'boringssl',
-    'boringssl_dependency%': '../third_party/boringssl/boringssl.gyp:crypto',
-
-    # There are three protobuf configurations:
-    #
-    # 1) protobuf_config == 'system'
-    # Use a system-wide installation of protobuf.
-    # Specify the protobuf library in protobuf_lib.
-    # Specify the path to protoc in protoc_bin.
-    #
-    # 2) protobuf_config == 'target'
-    # Use an existing protobuf gyp target from your project.
-    # Specify the protobuf gyp file and target in protobuf_lib_target.
-    # Specify the protoc gyp file and target in protoc_host_target.
-    # Specify the path to protoc in protoc_bin.
-    #
-    # 3) protobuf_config == 'source'  (default)
-    # Build protobuf and protoc from source.
-    # Specify the path to the protobuf source in protobuf_source.
-    'protobuf_config%': 'source',
-    'protobuf_source%': '../third_party/protobuf',
-    'protoc_host_target%': 'dummy',
-  },  # variables
-  'includes': ['core.gypi'],    # Get list of core source files.
+  'includes': [
+    'platform_properties.gypi',
+    'core.gypi',
+    'util.gypi',
+  ],    # Get list of core source files.
   'conditions': [
     ['protobuf_config=="source"', {
       # Include protobuf targets used by protobuf_config=='source'
@@ -113,6 +65,7 @@
         '../core/include',
         '../metrics/include',
         '../oemcrypto/include',
+        '../oemcrypto/odk/include',
         '../third_party/jsmn',
         '../util/include',
       ],
@@ -129,23 +82,23 @@
       },
       'sources': [
         '<@(wvcdm_sources)',
+        '<@(wvutil_sources)',
         '../core/src/oemcrypto_adapter_static.cpp',
-        '../core/src/privacy_crypto_<(privacy_crypto_impl).cpp',
         '../third_party/jsmn/jsmn.h',
         '../third_party/jsmn/jsmn.c',
       ],
+      'includes': [ '../util/libcrypto_dependency.gypi' ],
       'conditions': [
-        ['privacy_crypto_impl=="boringssl"', {
-          'dependencies': [
-            '<(boringssl_dependency)',
-          ],  # dependencies
-        }],  # privacy_crypto_impl=="boringssl"
-        ['privacy_crypto_impl=="apple"', {
-          'dependencies': [
-            '<(boringssl_dependency)',
-          ],  # dependencies
-        }],  # privacy_crypto_impl=="apple"
-      ],  # conditions
+        ['privacy_crypto_impl=="boringssl" or privacy_crypto_impl=="openssl"', {
+          'sources': [
+            '../core/src/privacy_crypto_boringssl.cpp',
+          ],
+        }, {  # else
+          'sources': [
+            '../core/src/privacy_crypto_<(privacy_crypto_impl).cpp',
+          ],
+        }],  # end else
+      ],
     },  # widevine_cdm_core target
     {
       'target_name': 'widevine_ce_cdm_static',