From c46372cc5720d4acf66ad4d928b74261289b5707 Mon Sep 17 00:00:00 2001
From: Tri Vo <trong@google.com>
Date: Tue, 6 Sep 2022 11:18:31 -0700
Subject: [PATCH] Use latest KM AIDL API

This makes it easier to upgrade KM AIDL version.

Test: m android.hardware.security.keymint-service.widevine
Change-Id: I251d7f3222617cbb3ba8b084c146aeb629f8eb6f
---
 libwvdrmengine/factory_upload_tool/Android.bp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libwvdrmengine/factory_upload_tool/Android.bp b/libwvdrmengine/factory_upload_tool/Android.bp
index 03a017f0..9947f318 100644
--- a/libwvdrmengine/factory_upload_tool/Android.bp
+++ b/libwvdrmengine/factory_upload_tool/Android.bp
@@ -23,7 +23,6 @@ cc_binary {
         "-Wextra",
     ],
     shared_libs: [
-        "android.hardware.security.keymint-V2-ndk",
         "libbase",
         "libbinder_ndk",
         "libcppbor_external",
@@ -35,6 +34,9 @@ cc_binary {
         "libutils",
         "libcppcose_rkp",
     ],
+    defaults: [
+        "keymint_use_latest_hal_aidl_ndk_shared",
+    ],
     srcs: [
         "service.cpp",
         "src/log.cpp",