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

Merge "Updated to use shared library instead of static library." into main am: 0140d4b523 am: dbc1536a08 am: 50ba5813c2

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

Change-Id: I75791739139a0e88f3089f7e98c2119ba02a0399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tri Vo 2023-09-01 23:13:06 +00:00 committed by Automerger Merge Worker
commit 4ee9e50879
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
keystore2/test_utils/Android.bp
View file

@ -40,28 +40,15 @@ rust_defaults {
"libthiserror",
],
static_libs: [
"libgtest",
"libkeymint_vts_test_utils",
"libkeystore2_ffi_test_utils",
],
shared_libs: [
// libkeymint_vts_test_utils needs to be static for atest,
// and that pulls in keymint shared lib dependency
"android.hardware.security.keymint-V3-ndk",
"libbase",
"libbinder",
"libbinder_ndk",
"libcppbor_external",
"libcppcose_rkp",
"libcrypto",
"libcutils",
"libkeymaster_messages",
"libkeymaster_portable",
"libkeymint_remote_prov_support",
"libkeymint_support",
"libkeymint_vts_test_utils",
"libkeystore-engine",
"libutils",
"packagemanager_aidl-cpp",
],
}
@ -94,14 +81,12 @@ cc_library_static {
"libkeystore2_ffi_test_utils_bridge_header",
],
generated_sources: ["libkeystore2_ffi_test_utils_bridge_code"],
static_libs: [
"libkeymint_vts_test_utils",
],
shared_libs: [
"libcppbor_external",
"libkeymaster_messages",
"libkeymaster_portable",
"libkeystore-engine",
"libkeymint_vts_test_utils",
],
}