Source release v3.2.0

2017-02-01 16:36:41 -08:00
parent 643b91b616
commit 2fde891c01
370 changed files with 40622 additions and 276133 deletions
--- a/cdm/cdm_unittests.gyp
+++ b/cdm/cdm_unittests.gyp
@@ -5,6 +5,7 @@
 {
  'variables': {
    'oemcrypto_lib%': '',
+    'oemcrypto_stubs%': '',
    'openssl_config%': 'system',
    'openssl_target%': '',
  },
@@ -38,13 +39,21 @@
        '../third_party/gmock.gyp:gtest',
      ],
      'conditions': [
-        ['oemcrypto_lib==""', {
+        ['oemcrypto_stubs!=""', {
          'dependencies': [
-            '../oemcrypto/mock/oec_mock.gyp:oec_mock',
+            '../oemcrypto/stubs/stubs.gyp:oec_stubs_v<(oemcrypto_version)',
          ],
        }, {
-          'libraries': [
-            '<(oemcrypto_lib)',
+          'conditions': [
+            ['oemcrypto_lib==""', {
+              'dependencies': [
+                '../oemcrypto/mock/oec_mock.gyp:oec_mock',
+              ],
+            }, {
+              'libraries': [
+                '<(oemcrypto_lib)',
+              ],
+            }],
          ],
        }],
      ],