From c5b7d179c2c74f3479b60b6c2bedbc2be94f7c22 Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Mon, 22 Nov 2021 15:15:57 +0000 Subject: [PATCH] Depend on KeyMint HAL via default This allows for easier bumping of the KeyMint version level. At the moment this change should have no effect: the same dependency is used, just reached via a default rather than explicitly. However, when the KeyMint version increases in the near future, using this default should mean that no change is needed here: the default definition will change to -V2 and this will be referenced here. Test: TreeHugger Change-Id: Ic250e5b91ee2b48cd7a05783ce21af16ae330ed1 --- gatekeeperd/Android.bp | 5 +++-- trusty/keymaster/Android.bp | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gatekeeperd/Android.bp b/gatekeeperd/Android.bp index a7f0c0ee4..0aedc5816 100644 --- a/gatekeeperd/Android.bp +++ b/gatekeeperd/Android.bp @@ -29,7 +29,9 @@ cc_binary { srcs: [ "gatekeeperd.cpp", ], - + defaults: [ + "keymint_use_latest_hal_aidl_ndk_shared", + ], shared_libs: [ "libbinder", "libbinder_ndk", @@ -43,7 +45,6 @@ cc_binary { "libhidlbase", "android.hardware.gatekeeper@1.0", "libgatekeeper_aidl", - "android.hardware.security.keymint-V1-ndk", "android.security.authorization-ndk", ], diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp index 99d9e564b..0e916ef37 100644 --- a/trusty/keymaster/Android.bp +++ b/trusty/keymaster/Android.bp @@ -105,8 +105,10 @@ cc_binary { "keymint/TrustySharedSecret.cpp", "keymint/service.cpp", ], + defaults: [ + "keymint_use_latest_hal_aidl_ndk_shared", + ], shared_libs: [ - "android.hardware.security.keymint-V1-ndk", "android.hardware.security.secureclock-V1-ndk", "android.hardware.security.sharedsecret-V1-ndk", "lib_android_keymaster_keymint_utils",