commit 49255346b4e95987ed185d1b055704f79d1acbcc
author David Drysdale <drysdale@google.com> Mon Nov 22 14:32:31 2021 +0000
committer David Drysdale <drysdale@google.com> Mon Nov 22 16:13:08 2021 +0000
tree b3fdeaf3f2c8b5dad4aeae3f990701c9ccd3d694
parent f665b8fa862e55c76ada5eee8bdc20eac9aa0734

Use defaults to reference current keymint version

The KeyMint HAL will soon be updated for a new version. To make this
process easier, add a cc_defaults and rust_defaults that references
the "current" version, and use this elsewhere. This should hopefully
mean that a future version bump only needs to happen in the defaults.

Test: TreeHugger
Change-Id: If7dd0c5778acb92177e16fd4fb4a04dcb837ad06

security/secureclock/aidl/vts/functional/Android.bp

diff --git a/security/secureclock/aidl/vts/functional/Android.bp b/security/secureclock/aidl/vts/functional/Android.bp
index 806517d..a34668b 100644
--- a/security/secureclock/aidl/vts/functional/Android.bp
+++ b/security/secureclock/aidl/vts/functional/Android.bp
@@ -27,6 +27,7 @@
     name: "VtsAidlSecureClockTargetTest",
     defaults: [
         "VtsHalTargetTestDefaults",
+        "keymint_use_latest_hal_aidl_ndk_static",
         "use_libaidlvintf_gtest_helper_static",
     ],
     cflags: [
@@ -41,7 +42,6 @@
         "libcrypto",
     ],
     static_libs: [
-        "android.hardware.security.keymint-V1-ndk",
         "android.hardware.security.secureclock-V1-ndk",
         "libkeymint",
     ],