Source release 14.0.0

2018-05-16 17:35:40 -07:00
parent 31381a1311
commit 3ab70cec4e
2053 changed files with 1585838 additions and 4614 deletions
--- a/cdm/cdm_unittests.gypi
+++ b/cdm/cdm_unittests.gypi
@@ -24,19 +24,7 @@
    'UNIT_TEST',
    'CDM_TESTS',
  ],
-  'conditions': [
-    # OpenSSL needed for http_socket
-    ['openssl_config == "target"', {
-      'dependencies': [
-        '<(openssl_target)',
-      ],
-    }, {
-      # openssl_config == "system"
-      'link_settings': {
-        'libraries': [
-          '-lssl',
-        ],
-      },
-    }],
+  'dependencies': [
+    '<(boringssl_dependency)',
  ],
 }