Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Wright
2013-09-05 22:31:07 +00:00
committed by Android (Google) Code Review
parent ea433f65dc 37ad207edc
commit 7314eb087f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CleanSpec.mk
View File

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

6
data/keyboards/keyboards.mk
View File

@@ -17,10 +17,10 @@
include $(LOCAL_PATH)/common.mk include $(LOCAL_PATH)/common.mk
PRODUCT_COPY_FILES := $(foreach file,$(framework_keylayouts),\ 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),\ 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),\ PRODUCT_COPY_FILES += $(foreach file,$(framework_keyconfigs),\
$(file):system/usr/idc/$(file)) $(file):system/usr/idc/$(notdir $(file)))