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/common.mk

diff --git a/data/keyboards/common.mk b/data/keyboards/common.mk
index 87c2ef5..d75b691 100644
--- a/data/keyboards/common.mk
+++ b/data/keyboards/common.mk
@@ -15,8 +15,8 @@
 # This is the list of framework provided keylayouts and key character maps to include.
 # Used by Android.mk and keyboards.mk.
 
-keylayouts := $(notdir $(wildcard $(LOCAL_PATH)/*.kl))
+framework_keylayouts := $(wildcard $(LOCAL_PATH)/*.kl)
 
-keycharmaps := $(notdir $(wildcard $(LOCAL_PATH)/*.kcm))
+framework_keycharmaps := $(wildcard $(LOCAL_PATH)/*.kcm)
 
-keyconfigs := $(notdir $(wildcard $(LOCAL_PATH)/*.idc))
+framework_keyconfigs := $(wildcard $(LOCAL_PATH)/*.idc)