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 /java/Android.mk | |
| 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 'java/Android.mk')
| -rw-r--r-- | java/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/Android.mk b/java/Android.mk index a07c50d88..875aad4f9 100644 --- a/java/Android.mk +++ b/java/Android.mk @@ -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 := \ |