summaryrefslogtreecommitdiff
path: root/packages/CtsShim
diff options
context:
space:
mode:
authorVictor Hsieh <victorhsieh@google.com>2019-05-29 13:06:18 -0700
committerVictor Hsieh <victorhsieh@google.com>2019-05-29 13:42:28 -0700
commita0f95e3d31bd96f08581e74e25f425accacd2d21 (patch)
treeb13380a41cafce3a4a6181e3cb45a4126d3c3ac1 /packages/CtsShim
parentf6f3f0b023f57e7bf30156b0095ae97fec505b1b (diff)
Keep CtsShimPriv's v2/v3 signature
The build system silently destroys APK's v2/v3 signature, even with the PRESIGNED one. This change prevents that. Test: apksigner shows v2/v3 signature are reserved (after manual copy to the prebuilts) Bug: 133505716 Change-Id: I34bab87157400b36bdf6a62f3c692523fcf2911c
Diffstat (limited to 'packages/CtsShim')
-rw-r--r--packages/CtsShim/build/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/CtsShim/build/Android.mk b/packages/CtsShim/build/Android.mk
index 03eb0d9aad5a..0ef4654d72e7 100644
--- a/packages/CtsShim/build/Android.mk
+++ b/packages/CtsShim/build/Android.mk
@@ -65,6 +65,9 @@ LOCAL_FULL_MANIFEST_FILE := $(gen)
LOCAL_MULTILIB := both
LOCAL_JNI_SHARED_LIBRARIES := libshim_jni
+# Explicitly uncompress native libs rather than letting the build system doing it and destroy the
+# v2/v3 signature.
+LOCAL_USE_EMBEDDED_NATIVE_LIBS := true
LOCAL_USE_AAPT2 := true