From 37ad207edc2b83ce23a35d1f0f4b7f3409151acc Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Thu, 5 Sep 2013 15:10:20 -0700 Subject: [PATCH] Fix broken copy of kl/kcm/idc files to system image Bug: 10633915 Change-Id: I244b85dc92d50bf8bdcfdf0fe32556eff8c5d279 --- CleanSpec.mk | 3 +++ data/keyboards/keyboards.mk | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 39742db62906f..8809bc7e2911b 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ************************************************ diff --git a/data/keyboards/keyboards.mk b/data/keyboards/keyboards.mk index d545241c2a3ef..68cbd29859bbf 100644 --- a/data/keyboards/keyboards.mk +++ b/data/keyboards/keyboards.mk @@ -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)))