Merge "Enable use_embedded_native_libs for CtsShimPrivUpgrade" into udc-dev am: 12aac90c36 am: 960c26e18b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23092776

Change-Id: Id4883ba87028c8fd5a5c44f7897aa9394584dd21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-05-09 10:35:21 +00:00
committed by Automerger Merge Worker

View File

@@ -43,6 +43,9 @@ android_app {
compile_multilib: "both", compile_multilib: "both",
jni_libs: ["libshim_jni"], jni_libs: ["libshim_jni"],
// Explicitly uncompress native libs rather than letting the build system doing it and destroy the
// v2/v3 signature.
use_embedded_native_libs: true,
uses_libs: ["android.test.runner"], uses_libs: ["android.test.runner"],
@@ -124,6 +127,9 @@ android_app {
compile_multilib: "both", compile_multilib: "both",
jni_libs: ["libshim_jni"], jni_libs: ["libshim_jni"],
// Explicitly uncompress native libs rather than letting the build system doing it and destroy the
// v2/v3 signature.
use_embedded_native_libs: true,
uses_libs: ["android.test.runner"], uses_libs: ["android.test.runner"],
} }