Source release v3.5.0

cdm/cdm_unittests.gyp

@@ -4,7 +4,6 @@
 # Refer to the distribution package's README for details.
 {
   'variables': {
-    'oemcrypto_lib%': '',
     'oemcrypto_stubs%': '',
     'openssl_config%': 'system',
     'openssl_target%': '',
@@ -22,9 +21,6 @@
         'test/test_host.cpp',
         'test/test_host.h',
       ],
-      'variables': {
-        'cdm_dir': '..',
-      },
       'includes': [
         'oemcrypto_unittests.gypi',
         'core_unittests.gypi',
@@ -35,6 +31,7 @@
       ],
       'dependencies': [
         'cdm.gyp:widevine_ce_cdm_shared',
+        'cdm.gyp:widevine_cdm_core',
         '../third_party/gmock.gyp:gmock',
         '../third_party/gmock.gyp:gtest',
       ],
@@ -45,13 +42,28 @@
           ],
         }, {
           'conditions': [
-            ['oemcrypto_lib==""', {
+            ['oemcrypto_lib=="mock"', {
               'dependencies': [
                 '../oemcrypto/mock/oec_mock.gyp:oec_mock',
               ],
-            }, {
-              'libraries': [
-                '<(oemcrypto_lib)',
+            }],
+            ['oemcrypto_lib=="level3"', {
+              'sources': [
+                # The test impl of OEMCrypto_Level3FileSystem and its factory.
+                'test/level3_file_system_ce_test.h',
+                'test/level3_file_system_ce_test.cpp',
+                'test/level3_file_system_test_factory.cpp',
+              ],
+              'conditions': [
+                ['oemcrypto_adapter=="static"', {
+                  'dependencies': [
+                    '../oemcrypto/level3/oec_level3.gyp:oec_level3_static',
+                  ],
+                }, {
+                  'dependencies': [
+                    '../oemcrypto/level3/oec_level3.gyp:oec_level3_dynamic',
+                  ],
+                }],
               ],
             }],
           ],