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

Merge "Remove unnecessary "_external" suffix from libcppbor" into main am: 86d8bf593a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3019944

Change-Id: Id52e0f6ae2ec34cfb2375437e100104383041385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-03-29 21:31:29 +00:00 committed by Automerger Merge Worker
commit 3e3c194ec3
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
identity/aidl/default/Android.bp
View file

@ -36,7 +36,7 @@ cc_library_static {
], ],
static_libs: [ static_libs: [
"libbase", "libbase",
"libcppbor_external", "libcppbor",
"libcppcose_rkp", "libcppcose_rkp",
"libutils", "libutils",
"libsoft_attestation_cert", "libsoft_attestation_cert",
@ -102,7 +102,7 @@ cc_binary {
], ],
static_libs: [ static_libs: [
"libbase", "libbase",
"libcppbor_external", "libcppbor",
"libcppcose_rkp", "libcppcose_rkp",
"libutils", "libutils",
"libsoft_attestation_cert", "libsoft_attestation_cert",
@ -146,7 +146,7 @@ cc_test {
], ],
static_libs: [ static_libs: [
"libbase", "libbase",
"libcppbor_external", "libcppbor",
"libcppcose_rkp", "libcppcose_rkp",
"libutils", "libutils",
"libsoft_attestation_cert", "libsoft_attestation_cert",

2
identity/aidl/vts/Android.bp
View file

@ -42,7 +42,7 @@ cc_test {
"android.hardware.security.rkp-V3-cpp", "android.hardware.security.rkp-V3-cpp",
"android.hardware.security.rkp-V3-ndk", "android.hardware.security.rkp-V3-ndk",
"android.hardware.security.secureclock-V1-ndk", "android.hardware.security.secureclock-V1-ndk",
"libcppbor_external", "libcppbor",
"libcppcose_rkp", "libcppcose_rkp",
"libkeymaster_portable", "libkeymaster_portable",
"libkeymint_vts_test_utils", "libkeymint_vts_test_utils",

4
identity/support/Android.bp
View file

@ -36,7 +36,7 @@ cc_defaults {
"libpuresoftkeymasterdevice", "libpuresoftkeymasterdevice",
], ],
static_libs: [ static_libs: [
"libcppbor_external", "libcppbor",
], ],
} }
@ -70,7 +70,7 @@ cc_test {
], ],
static_libs: [ static_libs: [
"android.hardware.identity-support-lib", "android.hardware.identity-support-lib",
"libcppbor_external", "libcppbor",
"libgmock", "libgmock",
], ],
test_suites: ["general-tests"], test_suites: ["general-tests"],

2
security/keymint/aidl/default/Android.bp
View file

@ -30,7 +30,7 @@ cc_binary {
"android.hardware.security.secureclock-V1-ndk", "android.hardware.security.secureclock-V1-ndk",
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"libcppbor_external", "libcppbor",
"libcrypto", "libcrypto",
"libkeymaster_portable", "libkeymaster_portable",
"libkeymint", "libkeymint",

2
security/keymint/aidl/vts/functional/Android.bp
View file

@ -45,7 +45,7 @@ cc_defaults {
"android.hardware.security.secureclock-V1-ndk", "android.hardware.security.secureclock-V1-ndk",
"libavb_user", "libavb_user",
"libavb", "libavb",
"libcppbor_external", "libcppbor",
"libcppcose_rkp", "libcppcose_rkp",
"libfs_mgr", "libfs_mgr",
"libjsoncpp", "libjsoncpp",

2
security/keymint/aidl/vts/performance/Android.bp
View file

@ -41,7 +41,7 @@ cc_benchmark {
], ],
static_libs: [ static_libs: [
"android.hardware.security.secureclock-V1-ndk", "android.hardware.security.secureclock-V1-ndk",
"libcppbor_external", "libcppbor",
"libchrome", "libchrome",
], ],
} }

4
security/keymint/support/Android.bp
View file

@ -72,7 +72,7 @@ cc_library {
shared_libs: [ shared_libs: [
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"libcppbor_external", "libcppbor",
"libcppcose_rkp", "libcppcose_rkp",
"libcrypto", "libcrypto",
"libkeymaster_portable", "libkeymaster_portable",
@ -94,7 +94,7 @@ cc_test {
], ],
shared_libs: [ shared_libs: [
"libbase", "libbase",
"libcppbor_external", "libcppbor",
"libcppcose_rkp", "libcppcose_rkp",
"libcrypto", "libcrypto",
"libjsoncpp", "libjsoncpp",

2
security/rkp/aidl/vts/functional/Android.bp
View file

@ -32,7 +32,7 @@ cc_test {
"libcrypto", "libcrypto",
], ],
static_libs: [ static_libs: [
"libcppbor_external", "libcppbor",
"libgmock_ndk", "libgmock_ndk",
"libkeymint_vts_test_utils", "libkeymint_vts_test_utils",
], ],