Use defaults to reference current keystore AIDL
The KeyMint HAL will soon be updated for a new version, which will in
turn induce a version bump for the keystore2 AIDL interface. To make
this process easier, add cc_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: I8999de92443fd121a9515dccde8d76094dc93023
diff --git a/keystore/Android.bp b/keystore/Android.bp
index 50d4432..892c5b4 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -36,7 +36,10 @@
cc_binary {
name: "keystore_cli_v2",
- defaults: ["keystore_defaults"],
+ defaults: [
+ "keystore_defaults",
+ "keystore2_use_latest_aidl_ndk_shared",
+ ],
cflags: [
"-DKEYMASTER_NAME_TAGS",
@@ -48,7 +51,6 @@
],
shared_libs: [
"android.security.apc-ndk",
- "android.system.keystore2-V1-ndk",
"libbinder",
"libbinder_ndk",
"libchrome",