diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2018-07-25 14:21:09 -0700 |
|---|---|---|
| committer | Yohei Yukawa <yukawa@google.com> | 2018-07-25 14:21:09 -0700 |
| commit | 9cd42f39eb31d4f0b9cb3a795025e8ab3663f3c8 (patch) | |
| tree | be975c1f2a1b62ea08a603d13a89b63c7f49a388 /tests | |
| parent | c0aa76f897a5bdba65290e16b997bfa1c480039e (diff) | |
| download | latinime-9cd42f39eb31d4f0b9cb3a795025e8ab3663f3c8.tar.gz latinime-9cd42f39eb31d4f0b9cb3a795025e8ab3663f3c8.tar.xz latinime-9cd42f39eb31d4f0b9cb3a795025e8ab3663f3c8.zip | |
Move <uses-sdk /> to a differnt XML
Basically Android Studio does want targetSdkVersion to be specified in
build.gradle rather than AndroidManifest.xml. To make both make build
and Android Studio build happy, this CL splits <uses-sdk /> from the
main AndroidManifest.xml to a different file and let them merged in
make build.
There should be no behavior change.
Bug: 110741422
Test: Manually verified that there is no difference in
AndroidManifest.xml in the APK.
Change-Id: Ib673bca5a31b2f95329c9310a127ec0701bd8fdc
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.mk | 4 | ||||
| -rw-r--r-- | tests/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | tests/AndroidManifest_SdkVersion.xml | 20 |
3 files changed, 24 insertions, 2 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 7c0bb4f71..23b0a9311 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -19,6 +19,10 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := shared +LOCAL_FULL_LIBS_MANIFEST_FILES := \ + $(LOCAL_PATH)/AndroidManifest.xml \ + $(LOCAL_PATH)/AndroidManifest_SdkVersion.xml + # Do not compress dictionary files to mmap dict data runtime LOCAL_AAPT_FLAGS += -0 .dict # Do not compress test data file diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index c7a9e13a2..93464f2b5 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -17,8 +17,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.inputmethod.latin.tests"> - <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" /> - <uses-permission android:name="android.permission.READ_CONTACTS" /> <application android:label="@string/app_name" diff --git a/tests/AndroidManifest_SdkVersion.xml b/tests/AndroidManifest_SdkVersion.xml new file mode 100644 index 000000000..5d3268c4d --- /dev/null +++ b/tests/AndroidManifest_SdkVersion.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 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. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.inputmethod.latin.tests"> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" /> +</manifest> |