diff options
| author | Eran Messeri <eranm@google.com> | 2024-01-08 17:49:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-08 17:49:14 +0000 |
| commit | ef1e8648cc1202b2adb777536c7ab7a531d8bd26 (patch) | |
| tree | 5aaadf09495ca846055185265864ffac11727165 | |
| parent | f2ddab0644aa541cf155e695b4353b653080f319 (diff) | |
| parent | 27b6e8982a95e4edaee83ab9b2dbe2fe68222b43 (diff) | |
| download | security-ef1e8648cc1202b2adb777536c7ab7a531d8bd26.tar.gz | |
Merge "Created libkeystore-engine as cc-library instead of cc-test-library to avoid issues while linking shared libraries with Rust test binaries." into main am: 46531afc61 am: 27b6e8982a
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2894132
Change-Id: I0bdba615fb7b6979269eb326cf0fd5bdae8a34b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | keystore-engine/Android.bp | 7 | ||||
| -rw-r--r-- | keystore2/test_utils/Android.bp | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/keystore-engine/Android.bp b/keystore-engine/Android.bp index 3087675b..88ae016c 100644 --- a/keystore-engine/Android.bp +++ b/keystore-engine/Android.bp @@ -21,9 +21,14 @@ package { default_applicable_licenses: ["system_security_license"], } -cc_test_library { +// This is expected to be cc_test_library but due to issue mentioned in b/298668920, b/314110490 +// we are creating cc_library and using static library to link with `keystore_client_tests`. +cc_library { name: "libkeystore-engine", + defaults: [ + "keystore2_use_latest_aidl_ndk_shared", + ], srcs: [ "android_engine.cpp", "keystore2_engine.cpp", diff --git a/keystore2/test_utils/Android.bp b/keystore2/test_utils/Android.bp index c16aa124..e37ba607 100644 --- a/keystore2/test_utils/Android.bp +++ b/keystore2/test_utils/Android.bp @@ -43,13 +43,14 @@ rust_defaults { ], static_libs: [ "libkeystore2_ffi_test_utils", + "libkeystore-engine", ], shared_libs: [ + "android.system.keystore2-V3-ndk", "libbase", "libcrypto", "libkeymaster_portable", "libkeymint_support", - "libkeystore-engine", ], } @@ -75,17 +76,18 @@ cc_library_static { srcs: ["ffi_test_utils.cpp"], defaults: [ "keymint_use_latest_hal_aidl_ndk_shared", + "keystore2_use_latest_aidl_ndk_shared", ], generated_headers: [ "cxx-bridge-header", "libkeystore2_ffi_test_utils_bridge_header", ], generated_sources: ["libkeystore2_ffi_test_utils_bridge_code"], + static_libs: ["libkeystore-engine"], shared_libs: [ "libbase", "libcrypto", "libkeymaster_portable", - "libkeystore-engine", "libkeymint_support", ], } |