Source release 14.0.0

cdm/core_unittests.gypi

@@ -9,7 +9,9 @@
     '../core/test/cdm_engine_test.cpp',
     '../core/test/cdm_session_unittest.cpp',
     '../core/test/config_test_env.cpp',
+    '../core/test/crypto_session_unittest.cpp',
     '../core/test/device_files_unittest.cpp',
+    # TODO(fredgc): generic tests don't work with prov 3.0.
     # '../core/test/generic_crypto_unittest.cpp',  # currently keybox only
     '../core/test/http_socket.cpp',
     '../core/test/initialization_data_unittest.cpp',
@@ -39,22 +41,8 @@
     'CORE_TESTS',
   ],
   'dependencies': [
-    'cdm.gyp:metrics_proto',
-    'cdm.gyp:device_files',
-  ],
-  'conditions': [
-    # OpenSSL needed for http_socket
-    ['openssl_config == "target"', {
-      'dependencies': [
-        '<(openssl_target)',
-      ],
-    }, {
-      # openssl_config == "system"
-      'link_settings': {
-        'libraries': [
-          '-lssl',
-        ],
-      },
-    }],
+    '<(boringssl_dependency)',
+    '<(metrics_target)',
+    '<(device_files_target)',
   ],
 }