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

Commit 9cd42f39 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

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
parent c0aa76f8

java/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ LOCAL_PACKAGE_NAME := LatinIME 


LOCAL_CERTIFICATE := shared



LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/AndroidManifest.xml \

    $(LOCAL_PATH)/AndroidManifest_SdkVersion.xml



LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime



LOCAL_STATIC_JAVA_LIBRARIES := \

java/AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
        coreApp="true"

        package="com.android.inputmethod.latin">



    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />



    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />

    <uses-permission android:name="android.permission.GET_ACCOUNTS" />

java/AndroidManifest_SdkVersion.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?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">

    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />

</manifest>

tests/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -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

tests/AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -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"