Merge "Depend on Keystore2 AIDL via default" am: b9f8c322c7

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1906281

Change-Id: I6383e6a45086539103bae5f19369532733d4aec5
This commit is contained in:
Treehugger Robot 2021-12-07 18:21:50 +00:00 committed by Automerger Merge Worker
commit 64a5600c83

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"],
@ -197,7 +198,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",