OEMCrypto v16.1

Merge of http://go/wvgerrit/93404

This CL updates the Widevine CDM to support OEMCrypto v16.1

Test: Tested in 16.2 CL
Bug: 141247171
Change-Id: I69bd993500f6fb63bf6010c8b0250dc7acc3d71b

libwvdrmengine/oemcrypto/odk/Android.bp

@@ -8,6 +8,7 @@ cc_library_static {
     include_dirs: [
         "vendor/widevine/libwvdrmengine/oemcrypto/include",
         "vendor/widevine/libwvdrmengine/oemcrypto/odk/include",
+        "vendor/widevine/libwvdrmengine/oemcrypto/odk/src",
     ],
 
     srcs: [
@@ -22,6 +23,33 @@ cc_library_static {
     owner: "widevine",
 }
 
+// ----------------------------------------------------------------
+// Builds libwv_kdo.a, The ODK Library companion (libwv_kdo) is used by
+// the CDM and by oemcrypto tests, but not by oemcrypto implementations.
+cc_library_static {
+    name: "libwv_kdo",
+    include_dirs: [
+        "vendor/widevine/libwvdrmengine/oemcrypto/include",
+        "vendor/widevine/libwvdrmengine/oemcrypto/odk/include",
+        "vendor/widevine/libwvdrmengine/oemcrypto/odk/src",
+    ],
+
+    srcs: [
+      "src/core_message_deserialize.cpp",
+      "src/core_message_serialize.cpp",
+      "src/core_message_serialize_proto.cpp",
+    ],
+
+    static_libs: [
+        "libcdm_protos",
+        "libwv_odk",
+    ],
+
+    proprietary: true,
+
+    owner: "widevine",
+}
+
 // ----------------------------------------------------------------
 // Builds odk_test executable, which tests the ODK library.
 cc_test {
@@ -29,7 +57,7 @@ cc_test {
     include_dirs: [
         "vendor/widevine/libwvdrmengine/oemcrypto/include",
         "vendor/widevine/libwvdrmengine/oemcrypto/odk/include",
-        "vendor/widevine/libwvdrmengine/oemcrypto/odk/kdo/include",
+        "vendor/widevine/libwvdrmengine/oemcrypto/odk/src",
     ],
 
     // WARNING: Module tags are not supported in Soong.
@@ -45,10 +73,10 @@ cc_test {
         "libcdm_protos",
         "libcdm",
         "libwv_odk",
+        "libwv_kdo",
     ],
 
     srcs: [
-        "kdo/src/oec_util.cpp",
         "test/odk_test.cpp",
         "test/odk_timer_test.cpp",
     ],