summaryrefslogtreecommitdiff
authorPekka Paalanen <ppaalanen@gmail.com>2012-09-14 09:14:12 (GMT)
committer Pekka Paalanen <ppaalanen@gmail.com>2012-09-14 09:14:12 (GMT)
commitd4803aad1a36738d15afb7b9591c7811c4ef1294 (patch) (side-by-side diff)
tree38a2f74b272562a6aa07fce0321882d509610602
parenteb0bd01f59d57fbff3c6dc478082951f2c854de2 (diff)
downloadweston-d4803aad1a36738d15afb7b9591c7811c4ef1294.tar.gz
weston-d4803aad1a36738d15afb7b9591c7811c4ef1294.tar.bz2
android: weston-clean also data files
And rename the macros in data/Android.mk.tmpl to avoid collision with xkb-config.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--data/Android.mk.tmpl9
1 files changed, 5 insertions, 4 deletions
diff --git a/data/Android.mk.tmpl b/data/Android.mk.tmpl
index 32a541f..a78f9ea 100644
--- a/data/Android.mk.tmpl
+++ b/data/Android.mk.tmpl
@@ -3,7 +3,7 @@ LOCAL_PATH:= $(call my-dir)
name_sanitise = $(strip $(subst .,_,$(subst /,_,$(1))))
-define xkb-install-one-file
+define weston-data-install-one-file
include $$(CLEAR_VARS)
srcfile := $(2:$(LOCAL_PATH)/%=%)
tgtpath := $$(TARGET_OUT)/$(1)/$$(dir $$(srcfile))
@@ -14,12 +14,13 @@ define xkb-install-one-file
LOCAL_MODULE_STEM := $$(notdir $$(srcfile))
LOCAL_SRC_FILES := $$(srcfile)
include $$(BUILD_PREBUILT)
+ weston-clean: clean-$(LOCAL_MODULE)
endef
# The files $(2) are installed into the device /system/$(1) directory
# with the path under $(LOCAL_PATH) included.
-define xkb-install-files
- $(foreach f,$(2),$(eval $(call xkb-install-one-file,$(1),$(f))))
+define weston-data-install-files
+ $(foreach f,$(2),$(eval $(call weston-data-install-one-file,$(1),$(f))))
endef
-$(call xkb-install-files,usr/share/weston,$(filelist))
+$(call weston-data-install-files,usr/share/weston,$(filelist))