Source release 16.2.0

oemcrypto/test/oemcrypto_unittests.gypi

@@ -7,6 +7,8 @@
 {
   'sources': [
     'oec_device_features.cpp',
+    'oec_decrypt_fallback_chain.cpp',
+    'oec_key_deriver.cpp',
     'oec_session_util.cpp',
     'oemcrypto_session_tests_helper.cpp',
     'oemcrypto_test.cpp',
@@ -14,14 +16,17 @@
   ],
   'include_dirs': [
     '<(util_dir)/include',
+    '<(util_dir)/test',
     '<(oemcrypto_dir)/include',
     '<(oemcrypto_dir)/ref/src',
     '<(oemcrypto_dir)/test',
+    '<(oemcrypto_dir)/odk/include',
   ],
   'defines': [
     'OEMCRYPTO_TESTS',
   ],
   'dependencies': [
-    '<(boringssl_dependency)',
+    '<(oemcrypto_dir)/odk/src/odk.gyp:odk',
   ],
+  'includes': [ '../../util/libssl_dependency.gypi' ],
 }