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

Merge "Remove ndk_platform backend. Use the ndk backend." am: 2624b3c19b am: 84a431d23b

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/1779388

Change-Id: I165be325a3fe99b815bffbcbec4ff059ec456643
This commit is contained in:
Jiyong Park 2021-08-03 12:10:47 +00:00 committed by Automerger Merge Worker
commit 1e9141c568
7 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
identity/Android.bp
View file

@ -48,8 +48,8 @@ cc_binary {
"android.hardware.identity-support-lib", "android.hardware.identity-support-lib",
"libkeymaster4support", "libkeymaster4support",
"libkeystore-attestation-application-id", "libkeystore-attestation-application-id",
"android.hardware.security.keymint-V1-ndk_platform", "android.hardware.security.keymint-V1-ndk",
"android.security.authorization-ndk_platform", "android.security.authorization-ndk",
], ],
static_libs: [ static_libs: [
"android.hardware.identity-V3-cpp", "android.hardware.identity-V3-cpp",

4
keystore-engine/Android.bp
View file

@ -36,7 +36,7 @@ cc_library_shared {
], ],
shared_libs: [ shared_libs: [
"android.system.keystore2-V1-ndk_platform", "android.system.keystore2-V1-ndk",
"libbinder_ndk", "libbinder_ndk",
"libcrypto", "libcrypto",
"libcutils", "libcutils",
@ -66,7 +66,7 @@ cc_library_shared {
], ],
shared_libs: [ shared_libs: [
"android.system.keystore2-V1-ndk_platform", "android.system.keystore2-V1-ndk",
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"libcrypto", "libcrypto",

4
keystore/Android.bp
View file

@ -47,8 +47,8 @@ cc_binary {
"keystore_client.proto", "keystore_client.proto",
], ],
shared_libs: [ shared_libs: [
"android.security.apc-ndk_platform", "android.security.apc-ndk",
"android.system.keystore2-V1-ndk_platform", "android.system.keystore2-V1-ndk",
"libbinder", "libbinder",
"libbinder_ndk", "libbinder_ndk",
"libchrome", "libchrome",

2
keystore/tests/Android.bp
View file

@ -62,7 +62,7 @@ cc_test {
"libgtest_main", "libgtest_main",
"libutils", "libutils",
"liblog", "liblog",
"android.security.apc-ndk_platform", "android.security.apc-ndk",
], ],
shared_libs: [ shared_libs: [
"libbinder_ndk", "libbinder_ndk",

4
keystore2/Android.bp
View file

@ -124,8 +124,8 @@ rust_binary {
// be removed once that works correctly. // be removed once that works correctly.
shared_libs: [ shared_libs: [
"android.hardware.confirmationui@1.0", "android.hardware.confirmationui@1.0",
"android.hardware.security.sharedsecret-V1-ndk_platform", "android.hardware.security.sharedsecret-V1-ndk",
"android.security.compat-ndk_platform", "android.security.compat-ndk",
"libc", "libc",
"libdl_android", "libdl_android",
"libdl", "libdl",

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

@ -57,11 +57,11 @@ cc_library {
"android.hardware.keymaster@3.0", "android.hardware.keymaster@3.0",
"android.hardware.keymaster@4.0", "android.hardware.keymaster@4.0",
"android.hardware.keymaster@4.1", "android.hardware.keymaster@4.1",
"android.hardware.security.keymint-V1-ndk_platform", "android.hardware.security.keymint-V1-ndk",
"android.hardware.security.secureclock-V1-ndk_platform", "android.hardware.security.secureclock-V1-ndk",
"android.hardware.security.sharedsecret-V1-ndk_platform", "android.hardware.security.sharedsecret-V1-ndk",
"android.security.compat-ndk_platform", "android.security.compat-ndk",
"android.system.keystore2-V1-ndk_platform", "android.system.keystore2-V1-ndk",
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"libcrypto", "libcrypto",
@ -78,10 +78,10 @@ cc_library {
name: "libkm_compat_service", name: "libkm_compat_service",
srcs: ["km_compat_service.cpp"], srcs: ["km_compat_service.cpp"],
shared_libs: [ shared_libs: [
"android.hardware.security.keymint-V1-ndk_platform", "android.hardware.security.keymint-V1-ndk",
"android.hardware.security.secureclock-V1-ndk_platform", "android.hardware.security.secureclock-V1-ndk",
"android.hardware.security.sharedsecret-V1-ndk_platform", "android.hardware.security.sharedsecret-V1-ndk",
"android.security.compat-ndk_platform", "android.security.compat-ndk",
"libbinder_ndk", "libbinder_ndk",
"libcrypto", "libcrypto",
"libkm_compat", "libkm_compat",
@ -107,11 +107,11 @@ cc_test {
"android.hardware.keymaster@3.0", "android.hardware.keymaster@3.0",
"android.hardware.keymaster@4.0", "android.hardware.keymaster@4.0",
"android.hardware.keymaster@4.1", "android.hardware.keymaster@4.1",
"android.hardware.security.keymint-V1-ndk_platform", "android.hardware.security.keymint-V1-ndk",
"android.hardware.security.secureclock-V1-ndk_platform", "android.hardware.security.secureclock-V1-ndk",
"android.hardware.security.sharedsecret-V1-ndk_platform", "android.hardware.security.sharedsecret-V1-ndk",
"android.security.compat-ndk_platform", "android.security.compat-ndk",
"android.system.keystore2-V1-ndk_platform", "android.system.keystore2-V1-ndk",
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"libcrypto", "libcrypto",

2
provisioner/Android.bp
View file

@ -48,7 +48,7 @@ cc_binary {
vendor: true, vendor: true,
srcs: ["rkp_factory_extraction_tool.cpp"], srcs: ["rkp_factory_extraction_tool.cpp"],
shared_libs: [ shared_libs: [
"android.hardware.security.keymint-V1-ndk_platform", "android.hardware.security.keymint-V1-ndk",
"libbinder", "libbinder",
"libbinder_ndk", "libbinder_ndk",
"libcrypto", "libcrypto",