Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20047d74 authored by Todd Kennedy's avatar Todd Kennedy
Browse files

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
parent 4e4fca43

packages/CtsShim/Android.mk

+16 −24
Original line number Diff line number Diff line
@@ -20,23 +20,19 @@ LOCAL_PATH := $(call my-dir) 
# Variant: Privileged app



include $(CLEAR_VARS)

# this needs to be a privileged application

LOCAL_PRIVILEGED_MODULE := true



LOCAL_MODULE := CtsShimPrivPrebuilt

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

# 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



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_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

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



include $(BUILD_PACKAGE)

LOCAL_SRC_FILES := CtsShim.apk



include $(BUILD_PREBUILT)

packages/CtsShim/CtsShim.apk

0 → 100644
+4.19 KiB

File added.

No diff preview for this file type.

View file

packages/CtsShim/CtsShimPriv.apk

0 → 100644
+5.88 KiB

File added.

No diff preview for this file type.

View file

packages/CtsShim/build/.gitignore

0 → 100644
+3 −0
Original line number Diff line number Diff line 
*.pk8

*.pem

packages/CtsShim/build/Android.mk

0 → 100644
+72 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2016 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



LOCAL_PATH := $(my-dir)



###########################################################

# Variant: Privileged app



include $(CLEAR_VARS)

# this needs to be a privileged application

LOCAL_PRIVILEGED_MODULE := true



LOCAL_MODULE_TAGS := optional

LOCAL_SDK_VERSION := current

LOCAL_PROGUARD_ENABLED := disabled

LOCAL_DEX_PREOPT := false



LOCAL_PACKAGE_NAME := CtsShimPriv



LOCAL_MANIFEST_FILE := shim_priv/AndroidManifest.xml



include $(BUILD_PACKAGE)





###########################################################

# Variant: Privileged app upgrade



include $(CLEAR_VARS)

# this needs to be a privileged application

LOCAL_PRIVILEGED_MODULE := true



LOCAL_MODULE_TAGS := optional

LOCAL_SDK_VERSION := current

LOCAL_PROGUARD_ENABLED := disabled

LOCAL_DEX_PREOPT := false



LOCAL_PACKAGE_NAME := CtsShimPrivUpgrade



LOCAL_MANIFEST_FILE := shim_priv_upgrade/AndroidManifest.xml



include $(BUILD_PACKAGE)





###########################################################

# Variant: System app



include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional

LOCAL_SDK_VERSION := current

LOCAL_PROGUARD_ENABLED := disabled

LOCAL_DEX_PREOPT := false



LOCAL_PACKAGE_NAME := CtsShim



LOCAL_MANIFEST_FILE := shim/AndroidManifest.xml



include $(BUILD_PACKAGE)