Source release 17.1.1

cdm/cdm_unittests.gyp

@@ -16,11 +16,8 @@
     'util_dir': '../util',
     'metrics_target': 'cdm.gyp:metrics_proto',
     'device_files_target': 'cdm.gyp:device_files',
-    # The path to the test device cert source file.
-    'device_cert_path%': 'test/device_cert.cpp',
     # The path to the prebuilt CDM to test against. (iOS only)
     'prebuilt_cdm_path%': '',
-    'prebuilt_cdm_cert%': '',
     'supports_dynamic_perf_test%': 0,
   },
   'targets': [{
@@ -30,8 +27,6 @@
       'test/cdm_test_main.cpp',
       'test/cdm_test_runner.cpp',
       'test/create_test_file_system.cpp',
-      '<(device_cert_path)',
-      'test/device_cert.h',
       # The test host, which is required for all test suites on CE.
       'test/test_host.cpp',
       'test/test_host.h',
@@ -52,12 +47,6 @@
       '../third_party/googletest.gyp:gmock',
       '../third_party/googletest.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
@@ -91,11 +80,6 @@
       }, {
         'type': 'executable',
       }],
-      ['oemcrypto_lib=="ref"', {
-        'dependencies': [
-          'oemcrypto_reference_implementation.gyp:oec_ref',
-        ],
-      }],
       # TODO(b/139814713): For testing and internal use only.
       ['oemcrypto_adapter_type=="static_v15"', {
         'defines': [
@@ -124,7 +108,7 @@
       }],
       ['oemcrypto_lib=="target"', {
         'dependencies': [
-          '<(oemcrypto_gyp_target)',
+          '<(oemcrypto_gyp_path)',
         ],
       }],
     ],
@@ -135,7 +119,6 @@
         'target_name': 'widevine_perf_test_dynamic',
         'type': 'executable',
         'sources': [
-          '<(device_cert_path)',
           '../core/test/config_test_env.cpp',
           '../core/test/http_socket.cpp',
           '../core/test/license_request.cpp',
@@ -199,27 +182,6 @@
       'conditions': [
         ['supports_dynamic_perf_test', {
           'targets': [{
-            'target_name': 'create_cert_cc',
-            'type': 'none',
-            'actions': [{
-              'action_name': 'gen_cert',
-              'message': 'Generating device_cert.cc',
-              'msvs_cygwin_shell': 0,
-              'inputs': [
-                'create_cert_cc.py',
-                '<(prebuilt_cdm_cert)',
-              ],
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/cert.cc',
-              ],
-              'action': [
-                'python',
-                'create_cert_cc.py',
-                '<(prebuilt_cdm_cert)',
-                '<(INTERMEDIATE_DIR)/cert.cc',
-              ],
-            }],
-          }, {
             'target_name': 'widevine_perf_test_xctest',
             'type': 'loadable_module',
             'mac_xctest_bundle': '1',
@@ -242,7 +204,6 @@
               '<(prebuilt_cdm_path)',
             ],
             'sources': [
-              '<(INTERMEDIATE_DIR)/cert.cc',
               '../core/test/config_test_env.cpp',
               '../core/test/http_socket.cpp',
               '../core/test/license_request.cpp',
@@ -266,7 +227,6 @@
             'dependencies': [
               '../third_party/googletest.gyp:gmock',
               '../third_party/googletest.gyp:gtest',
-              'create_cert_cc',
               'dummy_app',
             ],
           }],