Source release 14.0.0

cdm/cdm.gyp

@@ -7,24 +7,30 @@
 
 {
   'variables': {
-    # Override if you intend to link against a different OEMCrypto API version.
-    'oemcrypto_version%': 13,
-
-    # Override if you can't depend on OpenSSL for privacy features.
-    # If set to 'dummy', privacy mode in the CDM will fail.
-    'privacy_crypto_impl%': 'openssl',
-
-    # There are two openssl configurations:
+    # 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.
     #
-    # 1) openssl_config == 'system'
-    # Use the openssl headers found in the sysroot and link the system library.
-    #
-    # 2) openssl_config == 'target'
-    # Use the openssl implementation in an existing GYP target.
-    # Specify the openssl target in openssl_target. This target should forward
-    # the include path to its headers to its dependents.
-    'openssl_config%': 'system',
-    'openssl_target%': '',
+    # Valid values are:
+    # * x86
+    # * x86-64
+    # * arm
+    # * arm64
+    # * ppc64
+    # * none
+    'asm_target_arch%': 'none',
+
+    # 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:
     #
@@ -116,46 +122,16 @@
         '../third_party/jsmn/jsmn.c',
       ],
       'conditions': [
-        ['oemcrypto_version < 10', {
-          'sources': [
-            # Include APIs introduced in v10.
-            '../core/src/oemcrypto_adapter_static_v10.cpp',
-          ],
-        }],
-        ['oemcrypto_version < 11', {
-          'sources': [
-            # Include APIs introduced in v11.
-            '../core/src/oemcrypto_adapter_static_v11.cpp',
-          ],
-        }],
-        ['oemcrypto_version < 12', {
-          'sources': [
-            # Include APIs introduced in v12.
-            '../core/src/oemcrypto_adapter_static_v12.cpp',
-          ],
-        }],
-        ['oemcrypto_version < 13', {
-          'sources': [
-            # Include APIs introduced in v13.
-            '../core/src/oemcrypto_adapter_static_v13.cpp',
-          ],
-        }],
-        ['privacy_crypto_impl=="openssl"', {
-          'conditions': [
-            ['openssl_config == "target"', {
-              'dependencies': [
-                '<(openssl_target)',
-              ],
-            }, {
-              # openssl_config == "system"
-              'link_settings': {
-                'libraries': [
-                  '-lcrypto',
-                ],
-              },
-            }],
-          ],  # conditions
-        }],  # privacy_crypto_impl=="openssl"
+        ['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
     },  # widevine_cdm_core target
     {