From 888e4ddc249329ac1131c2d7c4d3aa0f7c22f773 Mon Sep 17 00:00:00 2001 From: Winson Chiu Date: Tue, 9 May 2023 00:10:52 +0000 Subject: [PATCH] Enable use_embedded_native_libs for CtsShimPrivUpgrade Attempt to work around a compressed JNI library check in the build. Bug: 278988121 Test: m CtsShimPrivUpgrade and dump with zipinfo Change-Id: I69449175a1649554dc99128bef535e1ece6884b7 --- packages/CtsShim/build/Android.bp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp index af3e2102e4300..d778febe9fafd 100644 --- a/packages/CtsShim/build/Android.bp +++ b/packages/CtsShim/build/Android.bp @@ -43,6 +43,9 @@ android_app { compile_multilib: "both", 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"], @@ -124,6 +127,9 @@ android_app { compile_multilib: "both", 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"], }