Source release 19.1.0

cdm/cdm_unittests.gyp

@@ -14,6 +14,7 @@
     'oemcrypto_dir': '../oemcrypto',
     # Directory where widevine utilities live.
     'util_dir': '../util',
+    'third_party_path%': '../third_party',
     'metrics_target': 'cdm.gyp:metrics_proto',
     'device_files_target': 'cdm.gyp:device_files',
     # The path to the prebuilt CDM to test against. (iOS only)
@@ -82,13 +83,6 @@
       }, {
         'type': 'executable',
       }],
-      # TODO(b/139814713): For testing and internal use only.
-      ['oemcrypto_adapter_type=="static_v15"', {
-        'defines': [
-          # This is used by the unit tests to use some v15 functions.
-          'TEST_OEMCRYPTO_V15',
-        ],
-      }],
       ['oemcrypto_lib=="level3"', {
         'sources': [
           # The test impl of OEMCrypto_Level3FileSystem and its factory.
@@ -146,6 +140,7 @@
         'dependencies': [
           '../third_party/googletest.gyp:gmock',
           '../third_party/googletest.gyp:gtest',
+          '<(device_files_target)',
         ],
         'conditions': [
           ['OS=="linux"', {