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

Commit 0e68a3ec authored by Winston Man's avatar Winston Man
Browse files

Update CtsShim with multiArch 

Add an empty .so to CTS for testing multiArch upgrade
Pre-built apk will be updated separately after this is merged
Testing build command will be updated later

Bug: 64504762
Test: all related cts and gts pass
Test: pre-built passed on all arch, including x86_64
Test: gts-tradefed run commandAndExit gts-dev --module GtsPackageManagerHostTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.PrivilegedUpdateTests
Change-Id: I5abfe06de0bd730b5cdc317df344b7567d50aff6
parent 348b13f5

packages/CtsShim/build/Android.mk

+11 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ LOCAL_PACKAGE_NAME := CtsShimPrivUpgrade 


LOCAL_MANIFEST_FILE := shim_priv_upgrade/AndroidManifest.xml



LOCAL_MULTILIB := both

LOCAL_JNI_SHARED_LIBRARIES := libshim_jni



include $(BUILD_PACKAGE)

my_shim_priv_upgrade_apk := $(LOCAL_BUILT_MODULE)
@@ -60,6 +63,9 @@ my_shim_priv_upgrade_apk := 


LOCAL_FULL_MANIFEST_FILE := $(gen)



LOCAL_MULTILIB := both

LOCAL_JNI_SHARED_LIBRARIES := libshim_jni



include $(BUILD_PACKAGE)



###########################################################
@@ -80,6 +86,9 @@ LOCAL_PACKAGE_NAME := CtsShimPrivUpgradeWrongSHA 


LOCAL_MANIFEST_FILE := shim_priv_upgrade/AndroidManifest.xml



LOCAL_MULTILIB := both

LOCAL_JNI_SHARED_LIBRARIES := libshim_jni



include $(BUILD_PACKAGE)
@@ -99,3 +108,5 @@ LOCAL_MANIFEST_FILE := shim/AndroidManifest.xml 


include $(BUILD_PACKAGE)



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

include $(call all-makefiles-under,$(LOCAL_PATH))

packages/CtsShim/build/jni/Android.mk

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

# Copyright (C) 2017 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 := $(call my-dir)



include $(CLEAR_VARS)



LOCAL_MODULE := libshim_jni



LOCAL_SRC_FILES := Shim.c



LOCAL_SDK_VERSION := 24



include $(BUILD_SHARED_LIBRARY)

packages/CtsShim/build/jni/Shim.c

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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.

 */



#include <jni.h>
 
 No newline at end of file

packages/CtsShim/build/shim_priv/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


    <application

        android:hasCode="false"

        android:multiArch="true"

        tools:ignore="AllowBackup,MissingApplicationIcon" >



        <!-- These activities don't actually exist; define them just to test the filters !-->

packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


    <application

        android:hasCode="false"

        android:multiArch="true"

        tools:ignore="AllowBackup,MissingApplicationIcon" >



        <!-- These activities don't actually exist; define them just to test the filters !-->