commit 18e14c75e3bce96690ac76c78fdb402af9740a01
author Michael Wright <michaelwr@google.com> Thu Aug 29 14:33:58 2013 -0700
committer Ying Wang <wangying@google.com> Tue Sep 03 12:27:18 2013 -0700
tree 7a98143cb9dd9738a2c7c7aad153bddb76509fd3
parent 5c2dfa8a21e7bd4e07e00f268d30058b654aa099

Fix keymap build dependencies and variable name collisions

Change-Id: I06e67ddc97429ae9c3d04143934c3f8233fcd22f

data/keyboards/keyboards.mk

diff --git a/data/keyboards/keyboards.mk b/data/keyboards/keyboards.mk
index c964961..d545241 100644
--- a/data/keyboards/keyboards.mk
+++ b/data/keyboards/keyboards.mk
@@ -16,11 +16,11 @@
 
 include $(LOCAL_PATH)/common.mk
 
-PRODUCT_COPY_FILES := $(foreach file,$(keylayouts),\
-    frameworks/base/data/keyboards/$(file):system/usr/keylayout/$(file))
+PRODUCT_COPY_FILES := $(foreach file,$(framework_keylayouts),\
+    $(file):system/usr/keylayout/$(file))
 
-PRODUCT_COPY_FILES += $(foreach file,$(keycharmaps),\
-    frameworks/base/data/keyboards/$(file):system/usr/keychars/$(file))
+PRODUCT_COPY_FILES += $(foreach file,$(framework_keycharmaps),\
+    $(file):system/usr/keychars/$(file))
 
-PRODUCT_COPY_FILES += $(foreach file,$(keyconfigs),\
-    frameworks/base/data/keyboards/$(file):system/usr/idc/$(file))
+PRODUCT_COPY_FILES += $(foreach file,$(framework_keyconfigs),\
+    $(file):system/usr/idc/$(file))