Merge "Depend on Keystore2 AIDL via default"
This commit is contained in:
commit
b9f8c322c7
1 changed files with 2 additions and 2 deletions
|
@ -107,6 +107,7 @@ cc_library_static {
|
||||||
defaults: [
|
defaults: [
|
||||||
"vold_default_flags",
|
"vold_default_flags",
|
||||||
"vold_default_libs",
|
"vold_default_libs",
|
||||||
|
"keystore2_use_latest_aidl_ndk_shared",
|
||||||
],
|
],
|
||||||
|
|
||||||
srcs: [
|
srcs: [
|
||||||
|
@ -164,7 +165,6 @@ cc_library_static {
|
||||||
shared_libs: [
|
shared_libs: [
|
||||||
"android.hardware.health.storage@1.0",
|
"android.hardware.health.storage@1.0",
|
||||||
"android.hardware.health.storage-V1-ndk",
|
"android.hardware.health.storage-V1-ndk",
|
||||||
"android.system.keystore2-V1-ndk",
|
|
||||||
"android.security.maintenance-ndk",
|
"android.security.maintenance-ndk",
|
||||||
"libbinder_ndk",
|
"libbinder_ndk",
|
||||||
"libkeymint_support",
|
"libkeymint_support",
|
||||||
|
@ -180,6 +180,7 @@ cc_binary {
|
||||||
defaults: [
|
defaults: [
|
||||||
"vold_default_flags",
|
"vold_default_flags",
|
||||||
"vold_default_libs",
|
"vold_default_libs",
|
||||||
|
"keystore2_use_latest_aidl_ndk_shared",
|
||||||
],
|
],
|
||||||
|
|
||||||
srcs: ["main.cpp"],
|
srcs: ["main.cpp"],
|
||||||
|
@ -197,7 +198,6 @@ cc_binary {
|
||||||
shared_libs: [
|
shared_libs: [
|
||||||
"android.hardware.health.storage@1.0",
|
"android.hardware.health.storage@1.0",
|
||||||
"android.hardware.health.storage-V1-ndk",
|
"android.hardware.health.storage-V1-ndk",
|
||||||
"android.system.keystore2-V1-ndk",
|
|
||||||
"android.security.maintenance-ndk",
|
"android.security.maintenance-ndk",
|
||||||
"libbinder_ndk",
|
"libbinder_ndk",
|
||||||
"libkeymint_support",
|
"libkeymint_support",
|
||||||
|
|
Loading…
Reference in a new issue