Source release 17.1.1

cdm/cdm_reboot_tests.gyp

@@ -16,8 +16,6 @@
     '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',
   },
   'targets': [{
     'toolsets' : [ 'target' ],
@@ -26,8 +24,6 @@
       'test/cdm_reboot_test_main.cpp',
       'test/cdm_test_runner.cpp',
       'test/create_test_file_system.cpp',
-      '<(device_cert_path)',
-      'test/device_cert.h',
       'test/test_host.cpp',
       'test/test_host.h',
       '../core/test/config_test_env.cpp',
@@ -66,10 +62,6 @@
       '<(device_files_target)',
     ],
     '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',
       'UNIT_TEST',
       'CDM_TESTS',
     ],
@@ -104,11 +96,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': [
@@ -137,7 +124,7 @@
       }],
       ['oemcrypto_lib=="target"', {
         'dependencies': [
-          '<(oemcrypto_gyp_target)',
+          '<(oemcrypto_gyp_path)',
         ],
       }],
     ],