From 20047d74d515d7bb09ee0186801edd6cf7b5431a Mon Sep 17 00:00:00 2001 From: Todd Kennedy Date: Wed, 20 Apr 2016 14:07:07 -0700 Subject: [PATCH] use prebuilt for the shim The testing shim should be included as a prebuilt. This allows us to destroy the signing key. This means that the shim can never be upgraded in the field; aside from its intended purpose in a CTS test. Bug: 28398205 Change-Id: I033835d227416ff8aa6602abfc8b977c74cb666d --- packages/CtsShim/Android.mk | 40 ++--- packages/CtsShim/CtsShim.apk | Bin 0 -> 4289 bytes packages/CtsShim/CtsShimPriv.apk | Bin 0 -> 6021 bytes packages/CtsShim/build/.gitignore | 3 + packages/CtsShim/build/Android.mk | 72 ++++++++ packages/CtsShim/build/README | 33 ++++ .../{ => build}/shim/AndroidManifest.xml | 9 +- .../shim_priv}/AndroidManifest.xml | 12 +- .../shim_priv_upgrade/AndroidManifest.xml | 161 ++++++++++++++++++ 9 files changed, 302 insertions(+), 28 deletions(-) create mode 100644 packages/CtsShim/CtsShim.apk create mode 100644 packages/CtsShim/CtsShimPriv.apk create mode 100644 packages/CtsShim/build/.gitignore create mode 100644 packages/CtsShim/build/Android.mk create mode 100644 packages/CtsShim/build/README rename packages/CtsShim/{ => build}/shim/AndroidManifest.xml (89%) rename packages/CtsShim/{priv_shim => build/shim_priv}/AndroidManifest.xml (95%) create mode 100644 packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml diff --git a/packages/CtsShim/Android.mk b/packages/CtsShim/Android.mk index 537b1714ba712..b827bdf11db9b 100644 --- a/packages/CtsShim/Android.mk +++ b/packages/CtsShim/Android.mk @@ -20,23 +20,19 @@ LOCAL_PATH := $(call my-dir) # Variant: Privileged app include $(CLEAR_VARS) + +LOCAL_MODULE := CtsShimPrivPrebuilt +LOCAL_MODULE_TAGS := optional # this needs to be a privileged application LOCAL_PRIVILEGED_MODULE := true +LOCAL_MODULE_CLASS := APPS +LOCAL_BUILT_MODULE_STEM := package.apk +# Make sure the build system doesn't try to resign the APK +LOCAL_CERTIFICATE := PRESIGNED -LOCAL_MODULE_TAGS := optional -LOCAL_SDK_VERSION := current -LOCAL_PROGUARD_ENABLED := disabled -LOCAL_DEX_PREOPT := false - -LOCAL_PACKAGE_NAME := CtsShimPriv - -#TODO need to find the correct certificate -#Change in conjunction with cts/hostsidetests/appsecurity/test-apps/IntentFilterApp -LOCAL_CERTIFICATE := platform -LOCAL_MANIFEST_FILE := priv_shim/AndroidManifest.xml - -include $(BUILD_PACKAGE) +LOCAL_SRC_FILES := CtsShimPriv.apk +include $(BUILD_PREBUILT) ########################################################### @@ -44,18 +40,14 @@ include $(BUILD_PACKAGE) include $(CLEAR_VARS) +LOCAL_MODULE := CtsShimPrebuilt LOCAL_MODULE_TAGS := optional -LOCAL_SDK_VERSION := current -LOCAL_PROGUARD_ENABLED := disabled -LOCAL_DEX_PREOPT := false +LOCAL_MODULE_CLASS := APPS +LOCAL_BUILT_MODULE_STEM := package.apk +# Make sure the build system doesn't try to resign the APK +LOCAL_CERTIFICATE := PRESIGNED -LOCAL_PACKAGE_NAME := CtsShim - -#TODO need to find the correct certificate -#Change in conjunction with cts/hostsidetests/appsecurity/test-apps/IntentFilterApp -LOCAL_CERTIFICATE := platform -LOCAL_MANIFEST_FILE := shim/AndroidManifest.xml - -include $(BUILD_PACKAGE) +LOCAL_SRC_FILES := CtsShim.apk +include $(BUILD_PREBUILT) diff --git a/packages/CtsShim/CtsShim.apk b/packages/CtsShim/CtsShim.apk new file mode 100644 index 0000000000000000000000000000000000000000..18e8e33fb91c8e2a984cc1618380329523780ee3 GIT binary patch literal 4289 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 HIBWd}JIzVt literal 0 HcmV?d00001 diff --git a/packages/CtsShim/CtsShimPriv.apk b/packages/CtsShim/CtsShimPriv.apk new file mode 100644 index 0000000000000000000000000000000000000000..48f35d37fb8130f55fa09bf838d9a918ce46ab4d GIT binary patch literal 6021 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 - + xmlns:tools="http://schemas.android.com/tools" + package="com.android.cts.ctsshim" + tools:ignore="MissingVersion" > + + diff --git a/packages/CtsShim/priv_shim/AndroidManifest.xml b/packages/CtsShim/build/shim_priv/AndroidManifest.xml similarity index 95% rename from packages/CtsShim/priv_shim/AndroidManifest.xml rename to packages/CtsShim/build/shim_priv/AndroidManifest.xml index 0a3f8235948c3..68c6a74736b54 100644 --- a/packages/CtsShim/priv_shim/AndroidManifest.xml +++ b/packages/CtsShim/build/shim_priv/AndroidManifest.xml @@ -16,8 +16,16 @@ - + xmlns:tools="http://schemas.android.com/tools" + package="com.android.cts.priv.ctsshim" + tools:ignore="MissingVersion" > + + + + diff --git a/packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml b/packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml new file mode 100644 index 0000000000000..af96dfd8b73ae --- /dev/null +++ b/packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +