Source release 15.0.0

cdm/cdm_unittests.gyp

@@ -12,7 +12,7 @@
     # Production Level 1 systems should use vendor.
     'oemcrypto_lib%': 'ref',
     # Override this for the location to the BoringSSL gyp file.
-    'boringssl_dependency%': '../third_party/boringssl/boringssl.gyp:legacy_ssl',
+    'boringssl_dependency%': '../third_party/boringssl/boringssl.gyp:ssl',
     # Directory where OEMCrypto header, test, and reference files lives.
     'oemcrypto_dir%': '../oemcrypto',
     # Directory where widevine utilities live.
@@ -38,14 +38,27 @@
         'core_unittests.gypi',
         'cdm_unittests.gypi',
       ],
-      'libraries': [
-        '-lpthread',  # gtest
-      ],
       'dependencies': [
-        'cdm.gyp:widevine_ce_cdm_shared',
+        'cdm.gyp:widevine_ce_cdm_static',
         '../third_party/gmock.gyp:gmock',
         '../third_party/gmock.gyp:gtest',
       ],
+      'defines': [
+        # The methods in util/ are marked as dllimport but in this case are
+        # being loaded in the static library.  So define this so Windows
+        # doesn't look in a DLL for the implementations.
+        'CORE_UTIL_IMPLEMENTATION',
+      ],
+      'msvs_settings': {
+        'VCLinkerTool': {
+          # Additionally, since they are loaded locally, suppress these
+          # warnings.
+          'AdditionalOptions': [
+            '/IGNORE:4049',
+            '/IGNORE:4217',
+          ],
+        },
+      },
       'conditions': [
         ['oemcrypto_lib=="ref"', {
           'dependencies': [
@@ -77,6 +90,7 @@
       'target_name': 'oec_ref',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'hard_dependency': 1,
       'includes': [
         '../oemcrypto/ref/oec_ref.gypi',
       ],