diff options
| author |   Anton Hansson <hansson@google.com> | 2019-01-14 01:56:34 -0800 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2019-01-14 01:56:34 -0800 |
| commit | d894eec1ee175ea2added063a3acc4d657a01919 (patch) | |
| tree | 1340a30ac267abf2521ab0ce34101138aa4c490b | |
| parent | dcf087ef89ae680859552c3bdcdb827093528bad (diff) | |
| parent | 84d156b1e6895c649327587a6ce459bfd9615483 (diff) | |
| download | latinime-d894eec1ee175ea2added063a3acc4d657a01919.tar.gz latinime-d894eec1ee175ea2added063a3acc4d657a01919.tar.xz latinime-d894eec1ee175ea2added063a3acc4d657a01919.zip | |
Merge "Move LatinIME and its lib to /product" am: 149b9d4f6e
am: 84d156b1e6
Change-Id: I386b9b5ed6ba02a4cd00efb75804ffef24603a2c
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | java/Android.bp | 2 | ||||
| -rw-r--r-- | native/jni/Android.bp | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index be13c30aa..98df622fa 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -52,6 +52,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinim $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/LatinIME) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_latinime.so) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/java/Android.bp b/java/Android.bp index 8681c8414..f6dc59661 100644 --- a/java/Android.bp +++ b/java/Android.bp @@ -40,6 +40,8 @@ android_app { sdk_version: "current", + product_specific: true, + optimize: { proguard_flags_files: ["proguard.flags"], }, diff --git a/native/jni/Android.bp b/native/jni/Android.bp index 3bf70ad49..0d4b3bb65 100644 --- a/native/jni/Android.bp +++ b/native/jni/Android.bp @@ -105,6 +105,7 @@ filegroup { cc_library { name: "libjni_latinime", host_supported: true, + product_specific: true, sdk_version: "14", cflags: [ |