Merge "Move LatinIME and its lib to /product" am: 149b9d4f6e

am: 84d156b1e6

Change-Id: I386b9b5ed6ba02a4cd00efb75804ffef24603a2c
main
Anton Hansson 2019-01-14 01:56:34 -08:00 committed by android-build-merger
commit d894eec1ee
3 changed files with 6 additions and 0 deletions

View File

@ -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)/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 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

View File

@ -40,6 +40,8 @@ android_app {
sdk_version: "current", sdk_version: "current",
product_specific: true,
optimize: { optimize: {
proguard_flags_files: ["proguard.flags"], proguard_flags_files: ["proguard.flags"],
}, },

View File

@ -105,6 +105,7 @@ filegroup {
cc_library { cc_library {
name: "libjni_latinime", name: "libjni_latinime",
host_supported: true, host_supported: true,
product_specific: true,
sdk_version: "14", sdk_version: "14",
cflags: [ cflags: [