diff options
| author |   Anton Hansson <hansson@google.com> | 2019-01-14 02:11:11 -0800 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2019-01-14 02:11:11 -0800 |
| commit | 575340c674b65c1fd0a539411ace43096172a901 (patch) | |
| tree | 04d339bbd8c55edd19be3b137aa57443f55ac416 | |
| parent | 03a08ce11fc8838b418aabbfeb80b9a062304471 (diff) | |
| parent | d894eec1ee175ea2added063a3acc4d657a01919 (diff) | |
| download | latinime-575340c674b65c1fd0a539411ace43096172a901.tar.gz latinime-575340c674b65c1fd0a539411ace43096172a901.tar.xz latinime-575340c674b65c1fd0a539411ace43096172a901.zip | |
Merge "Move LatinIME and its lib to /product" am: 149b9d4f6e am: 84d156b1e6
am: d894eec1ee
Change-Id: Ib7cdb0007c22934f7736cd02c02e0f9358f889d4
| -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 fbf27ceb0..f41e94af0 100644 --- a/java/Android.bp +++ b/java/Android.bp @@ -38,6 +38,8 @@ android_app { target_sdk_version: "23", 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 9f7dbce47..5649fc1ea 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: [ |