tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use defaults to reference current keystore AIDL"

Browse source
This commit is contained in:
David Drysdale 2021-12-07 06:36:42 +00:00 committed by Gerrit Code Review
commit b7d67b606c
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
keystore/Android.bp
View file

@ -36,7 +36,10 @@ cc_defaults {
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 @@ cc_binary {
],
shared_libs: [
"android.security.apc-ndk",
"android.system.keystore2-V1-ndk",
"libbinder",
"libbinder_ndk",
"libchrome",

16
keystore2/aidl/Android.bp
View file

@ -191,3 +191,19 @@ aidl_interface {
},
}
// cc_defaults that includes the latest Keystore2 AIDL library.
// Modules that depend on KeyMint directly can include this cc_defaults to avoid
// managing dependency versions explicitly.
cc_defaults {
name: "keystore2_use_latest_aidl_ndk_static",
static_libs: [
"android.system.keystore2-V1-ndk",
],
}
cc_defaults {
name: "keystore2_use_latest_aidl_ndk_shared",
shared_libs: [
"android.system.keystore2-V1-ndk",
],
}

4
keystore2/src/km_compat/Android.bp
View file

@ -58,6 +58,7 @@ cc_library {
srcs: ["km_compat.cpp"],
defaults: [
"keymint_use_latest_hal_aidl_ndk_shared",
"keystore2_use_latest_aidl_ndk_shared",
],
shared_libs: [
"android.hardware.keymaster@3.0",
@ -66,7 +67,6 @@ cc_library {
"android.hardware.security.secureclock-V1-ndk",
"android.hardware.security.sharedsecret-V1-ndk",
"android.security.compat-ndk",
"android.system.keystore2-V1-ndk",
"libbase",
"libbinder_ndk",
"libcrypto",
@ -112,6 +112,7 @@ cc_test {
],
defaults: [
"keymint_use_latest_hal_aidl_ndk_shared",
"keystore2_use_latest_aidl_ndk_shared",
],
shared_libs: [
"android.hardware.keymaster@3.0",
@ -120,7 +121,6 @@ cc_test {
"android.hardware.security.secureclock-V1-ndk",
"android.hardware.security.sharedsecret-V1-ndk",
"android.security.compat-ndk",
"android.system.keystore2-V1-ndk",
"libbase",
"libbinder_ndk",
"libcrypto",