From 03f7133b0efe03ff0f144f1731c11bdd5098691f Mon Sep 17 00:00:00 2001
From: Karuna Wadhera <kwadhera@google.com>
Date: Wed, 23 Oct 2024 04:05:49 +0000
Subject: [PATCH] Pin KeyMint dependency to correct/specific version

libkeymint depends on the latest version of the HAL, which will soon be
bumped to v4. Since this implementation won't immediately be upgraded,
and this dependency seems unused, remove it.

Bug: 369375199
Test: Treehugger
Change-Id: I5e952595bb4d4d8a283b286b5054576394788f16
---
 trusty/keymaster/Android.bp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index aca59b6c6..cb078299e 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -105,19 +105,17 @@ cc_binary {
         "keymint/TrustySharedSecret.cpp",
         "keymint/service.cpp",
     ],
-    defaults: [
-        "keymint_use_latest_hal_aidl_ndk_shared",
-    ],
     shared_libs: [
+        "android.hardware.security.keymint-V3-ndk",
         "android.hardware.security.rkp-V3-ndk",
         "android.hardware.security.secureclock-V1-ndk",
         "android.hardware.security.sharedsecret-V1-ndk",
-        "lib_android_keymaster_keymint_utils",
+        "lib_android_keymaster_keymint_utils_V3",
         "libbase",
         "libbinder_ndk",
         "libhardware",
         "libkeymaster_messages",
-        "libkeymint",
+        "libkeymasterconfig",
         "liblog",
         "libtrusty",
         "libutils",