Depend on Keystore2 AIDL via default

This allows for easier bumping of the KeyMint/Keystore2 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 Keystore2 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: I7cec2cd8fac137e5ac7e95db06e738e94a3cc567
This commit is contained in:
David Drysdale 2021-11-22 18:19:40 +00:00
parent bddb449182
commit 4babbc78d5

View file

@ -107,6 +107,7 @@ cc_library_static {
defaults: [
"vold_default_flags",
"vold_default_libs",
"keystore2_use_latest_aidl_ndk_shared",
],
srcs: [
@ -164,7 +165,6 @@ cc_library_static {
shared_libs: [
"android.hardware.health.storage@1.0",
"android.hardware.health.storage-V1-ndk",
"android.system.keystore2-V1-ndk",
"android.security.maintenance-ndk",
"libbinder_ndk",
"libkeymint_support",
@ -180,6 +180,7 @@ cc_binary {
defaults: [
"vold_default_flags",
"vold_default_libs",
"keystore2_use_latest_aidl_ndk_shared",
],
srcs: ["main.cpp"],
@ -196,7 +197,6 @@ cc_binary {
shared_libs: [
"android.hardware.health.storage@1.0",
"android.hardware.health.storage-V1-ndk",
"android.system.keystore2-V1-ndk",
"android.security.maintenance-ndk",
"libbinder_ndk",
"libkeymint_support",