From a0f95e3d31bd96f08581e74e25f425accacd2d21 Mon Sep 17 00:00:00 2001
From: Victor Hsieh <victorhsieh@google.com>
Date: Wed, 29 May 2019 13:06:18 -0700
Subject: [PATCH] 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
---
 packages/CtsShim/build/Android.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/CtsShim/build/Android.mk b/packages/CtsShim/build/Android.mk
index 03eb0d9aad5ad..0ef4654d72e7d 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