From a7ab17d0a3ad20b068f99da58ba331cc63ee8237 Mon Sep 17 00:00:00 2001 From: Bjorn Bringert Date: Thu, 14 Jan 2010 17:33:44 +0000 Subject: [PATCH] Allow multiple directories in LOCAL_RESOURCE_DIR Before, LOCAL_RESOURCE_DIR got messed up when the build system tried to find the whole LOCAL_RESOURCE_DIR string in each overlay directory. This change splits LOCAL_RESOURCE_DIR before appending it to the overlay directory paths. I've verified that this now works: LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/overlay $(LOCAL_PATH)/res Change-Id: Iea47f94a14720af0ca4b422aec30acf4acbe13cf --- core/package.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/package.mk b/core/package.mk index 70f10e07f7..2ee399680b 100644 --- a/core/package.mk +++ b/core/package.mk @@ -69,8 +69,10 @@ ifeq (,$(LOCAL_RESOURCE_DIR)) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res endif LOCAL_RESOURCE_DIR := \ - $(wildcard $(addsuffix /$(LOCAL_RESOURCE_DIR), $(PRODUCT_PACKAGE_OVERLAYS))) \ - $(wildcard $(addsuffix /$(LOCAL_RESOURCE_DIR), $(DEVICE_PACKAGE_OVERLAYS))) \ + $(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \ + $(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR)))) \ + $(wildcard $(foreach dir, $(DEVICE_PACKAGE_OVERLAYS), \ + $(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR)))) \ $(LOCAL_RESOURCE_DIR) # this is an app, so add the system libraries to the search path