Source release v2.1.3-2-789 + third_party libs

Change-Id: I8648756dab3fe1f53d6da18b83cd1294581d1abe
2014-06-19 17:13:42 -07:00
parent 73445a920c
commit 84acd5a15e
32 changed files with 1340 additions and 1335 deletions
--- a/cdm/cdm.gyp
+++ b/cdm/cdm.gyp
@@ -91,12 +91,14 @@
            '../core/src/privacy_crypto_dummy.cpp',
          ],
        }],
-      ],
-      'direct_dependencies': [
-        'device_files',
-        'license_protocol',
-      ],
-      'conditions': [
+        ['oemcrypto_v8=="true"', {
+          'sources!': [  # exclude
+            '../core/src/oemcrypto_adapter_static.cpp',
+          ],
+          'sources': [  # include
+            '../core/src/oemcrypto_adapter_static_v8.cpp',
+          ],
+        }],
        ['use_system_protobuf=="true"', {
          'direct_dependent_settings': {
            'libraries': [