Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update CtsShim with multiArch" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-13 20:22:56 +00:00
committed by Android (Google) Code Review
parent 4018898ae4 0e68a3ec0a
commit 0d2d6b6a86
5 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/CtsShim/build/Android.mk
View File

@@ -32,6 +32,9 @@ LOCAL_PACKAGE_NAME := CtsShimPrivUpgrade
LOCAL_MANIFEST_FILE := shim_priv_upgrade/AndroidManifest.xml LOCAL_MANIFEST_FILE := shim_priv_upgrade/AndroidManifest.xml
LOCAL_MULTILIB := both
LOCAL_JNI_SHARED_LIBRARIES := libshim_jni
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
my_shim_priv_upgrade_apk := $(LOCAL_BUILT_MODULE) my_shim_priv_upgrade_apk := $(LOCAL_BUILT_MODULE)
@@ -60,6 +63,9 @@ my_shim_priv_upgrade_apk :=
LOCAL_FULL_MANIFEST_FILE := $(gen) LOCAL_FULL_MANIFEST_FILE := $(gen)
LOCAL_MULTILIB := both
LOCAL_JNI_SHARED_LIBRARIES := libshim_jni
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
########################################################### ###########################################################
@@ -80,6 +86,9 @@ LOCAL_PACKAGE_NAME := CtsShimPrivUpgradeWrongSHA
LOCAL_MANIFEST_FILE := shim_priv_upgrade/AndroidManifest.xml LOCAL_MANIFEST_FILE := shim_priv_upgrade/AndroidManifest.xml
LOCAL_MULTILIB := both
LOCAL_JNI_SHARED_LIBRARIES := libshim_jni
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
@@ -99,3 +108,5 @@ LOCAL_MANIFEST_FILE := shim/AndroidManifest.xml
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
###########################################################
include $(call all-makefiles-under,$(LOCAL_PATH))

27
packages/CtsShim/build/jni/Android.mk Normal file
View File

@@ -0,0 +1,27 @@
#
# 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)

17
packages/CtsShim/build/jni/Shim.c Normal file
View File

@@ -0,0 +1,17 @@
/*
* 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>

1
packages/CtsShim/build/shim_priv/AndroidManifest.xml
View File

@@ -27,6 +27,7 @@
<application <application
android:hasCode="false" android:hasCode="false"
android:multiArch="true"
tools:ignore="AllowBackup,MissingApplicationIcon" > tools:ignore="AllowBackup,MissingApplicationIcon" >
<!-- These activities don't actually exist; define them just to test the filters !--> <!-- These activities don't actually exist; define them just to test the filters !-->

1
packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml
View File

@@ -24,6 +24,7 @@
<application <application
android:hasCode="false" android:hasCode="false"
android:multiArch="true"
tools:ignore="AllowBackup,MissingApplicationIcon" > tools:ignore="AllowBackup,MissingApplicationIcon" >
<!-- These activities don't actually exist; define them just to test the filters !--> <!-- These activities don't actually exist; define them just to test the filters !-->