Update to ODK v19.2

oemcrypto/odk/Android.bp

@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC. All rights reserved. This file and proprietary
+// Copyright 2019 Google LLC. This file and proprietary
 // source code may only be used and distributed under the Widevine
 // License Agreement.
 
@@ -25,6 +25,11 @@ cc_library_static {
         "vendor/widevine/libwvdrmengine/oemcrypto/odk/include",
         "vendor/widevine/libwvdrmengine/oemcrypto/odk/src",
     ],
+    header_libs: [
+        "jni_headers",
+        "libbase_headers",
+        "liblog_headers",
+    ],
 
     srcs: [
         "src/odk.c",
@@ -38,7 +43,7 @@ cc_library_static {
     proprietary: true,
 
     owner: "widevine",
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }
 
 // ----------------------------------------------------------------
@@ -51,6 +56,11 @@ cc_library_static {
         "vendor/widevine/libwvdrmengine/oemcrypto/odk/include",
         "vendor/widevine/libwvdrmengine/oemcrypto/odk/src",
     ],
+    header_libs: [
+        "jni_headers",
+        "libbase_headers",
+        "liblog_headers",
+    ],
 
     srcs: [
       "src/core_message_deserialize.cpp",
@@ -100,6 +110,9 @@ cc_test {
     ],
 
     srcs: [
+        "test/odk_golden_v16.cpp",
+        "test/odk_golden_v17.cpp",
+        "test/odk_golden_v18.cpp",
         "test/odk_test.cpp",
         "test/odk_test_helper.cpp",
         "test/odk_timer_test.cpp",