summaryrefslogtreecommitdiff
authorPekka Paalanen <ppaalanen@gmail.com>2012-09-14 09:23:01 (GMT)
committer Pekka Paalanen <ppaalanen@gmail.com>2012-09-14 09:23:01 (GMT)
commitb482c69ebeb65a32ff162a03480333471d3fb5b7 (patch) (side-by-side diff)
tree08e76d7bac74708609255d450bc3f1380bcb0291
parentd4803aad1a36738d15afb7b9591c7811c4ef1294 (diff)
downloadweston-b482c69ebeb65a32ff162a03480333471d3fb5b7.tar.gz
weston-b482c69ebeb65a32ff162a03480333471d3fb5b7.tar.bz2
android: fix data files install
Fix the error: make: *** No rule to make target `external/collabora/weston/data//home/pq/android/galaxy-nexus-4.0.4/external/collabora/weston/data/border.png', needed by `out/target/product/maguro/obj/ETC/xkb-config-_home_pq_android_galaxy-nexus-4_0_4_external_collabora_weston_data_border_png_intermediates/border.png'. Stop. 'filelist' has always contained absolute paths, since there is no easy way to have paths relative to the android root dir. Now the install rules broke, apparently because LOCAL_PATH moved to a path relative to the android root. Explicitly convert LOCAL_PATH to absolute for path mangling.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--data/Android.mk.tmpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/Android.mk.tmpl b/data/Android.mk.tmpl
index a78f9ea..0ed6800 100644
--- a/data/Android.mk.tmpl
+++ b/data/Android.mk.tmpl
@@ -5,7 +5,7 @@ name_sanitise = $(strip $(subst .,_,$(subst /,_,$(1))))
define weston-data-install-one-file
include $$(CLEAR_VARS)
- srcfile := $(2:$(LOCAL_PATH)/%=%)
+ srcfile := $(2:$(abspath $(LOCAL_PATH))/%=%)
tgtpath := $$(TARGET_OUT)/$(1)/$$(dir $$(srcfile))
LOCAL_MODULE := $$(call name_sanitise,xkb-config-$$(srcfile))
LOCAL_MODULE_CLASS := ETC