Source release v3.0.0-0-g8d3792b-ce + third_party

Change-Id: I399e71ddfffcd436171d1c60283c63ab4658e0b1

cdm/cdm_unittests.gyp

@@ -1,51 +1,50 @@
-# Copyright 2013 Google Inc. All Rights Reserved.
+# Copyright 2015 Google Inc. All Rights Reserved.
 #
 # Builds under the CDM ./build.py (target platform) build system
 # Refer to the distribution package's README for details.
-#
 {
+  'variables': {
+    'oemcrypto_lib%': '',
+  },
   'targets': [
     {
-      'target_name': 'wvcdm_shared_api_unittest',
+      'target_name': 'widevine_ce_cdm_unittest',
       'type': 'executable',
       'sources': [
-        '../cdm/test/cdm_api_1_test.cpp',
-        '../cdm/test/cdm_api_4_test.cpp',
-        '../cdm/test/cdm_test_main.cpp',
-        '../cdm/test/device_cert.cpp',
-        '../cdm/test/device_cert.h',
-        '../cdm/test/test_host_1.cpp',
-        '../cdm/test/test_host_4.cpp',
-        '../cdm/test/test_host_4_file_io.cpp',
-        '../cdm/test/test_util.cpp',
-        '../core/test/config_test_env.cpp',
-        '../core/test/license_request.cpp',
-        '../core/test/http_socket.cpp',
-        '../core/test/test_printers.cpp',
-        '../core/test/url_request.cpp',
+        # The test runner and the testing device certificate.
+        'test/cdm_test_main.cpp',
+        'test/device_cert.cpp',
+        'test/device_cert.h',
+        # The test host, which is required for all test suites on CE.
+        'test/test_host.cpp',
+        'test/test_host.h',
       ],
-      'include_dirs': [
-        'include',
-        '../cdm/include',
-        '../core/include',
-        '../core/test',
-        '../oemcrypto/include',
-      ],
-      'defines': [
-        'UNIT_TEST',
+      'includes': [
+        'oemcrypto_unittests.gypi',
+        'core_unittests.gypi',
+        'cdm_unittests.gypi',
       ],
       'libraries': [
-        '-lssl',
-        '-lcrypto',
-        '-lpthread',
+        '-lcrypto',  # oec_mock
+        '-lssl',  # oec_mock
+        '-lpthread',  # gtest
       ],
       'dependencies': [
-        'cdm.gyp:wvcdm_shared',
+        'cdm.gyp:widevine_ce_cdm_shared',
         '../third_party/gmock.gyp:gmock',
-        '../third_party/gmock.gyp:gmock_main',
         '../third_party/gmock.gyp:gtest',
       ],
+      'conditions': [
+        ['oemcrypto_lib==""', {
+          'dependencies': [
+            '../oemcrypto/mock/oec_mock.gyp:oec_mock',
+          ],
+        }, {
+          'libraries': [
+            '<(oemcrypto_lib)',
+          ],
+        }],
+      ],
     },
   ],
 }
-