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

Commit 7314eb08 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Fix broken copy of kl/kcm/idc files to system image" into klp-dev

parents ea433f65 37ad207e

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -176,6 +176,9 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/os/IBattery*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/idc/frameworks)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/keylayout/frameworks)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/keychars/frameworks)

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

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

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

data/keyboards/keyboards.mk

+3 −3
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
include $(LOCAL_PATH)/common.mk



PRODUCT_COPY_FILES := $(foreach file,$(framework_keylayouts),\

    $(file):system/usr/keylayout/$(file))

    $(file):system/usr/keylayout/$(notdir $(file)))



PRODUCT_COPY_FILES += $(foreach file,$(framework_keycharmaps),\

    $(file):system/usr/keychars/$(file))

    $(file):system/usr/keychars/$(notdir $(file)))



PRODUCT_COPY_FILES += $(foreach file,$(framework_keyconfigs),\

    $(file):system/usr/idc/$(file))
 
    $(file):system/usr/idc/$(notdir $(file)))