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

Commit 575340c6 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Move LatinIME and its lib to /product" am: 149b9d4f am: 84d156b1 

am: d894eec1

Change-Id: Ib7cdb0007c22934f7736cd02c02e0f9358f889d4
parents 03a08ce1 d894eec1

CleanSpec.mk

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

# ************************************************

java/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ android_app { 
    target_sdk_version: "23",

    sdk_version: "current",



    product_specific: true,



    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },

native/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ filegroup { 
cc_library {

    name: "libjni_latinime",

    host_supported: true,

    product_specific: true,



    sdk_version: "14",

    cflags: [