diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-20 14:03:55 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-20 14:03:55 -0800 |
| commit | ed18741e07c5e344ff3375a293100ffb29f19b51 (patch) | |
| tree | 4c125df2b0b0336e88a7e2389f74b53ab982d906 /core/package.mk | |
| parent | 66339ad5cebeae8f4cbf7e335c67368abbb91223 (diff) | |
| download | build-ed18741e07c5e344ff3375a293100ffb29f19b51.zip build-ed18741e07c5e344ff3375a293100ffb29f19b51.tar.gz build-ed18741e07c5e344ff3375a293100ffb29f19b51.tar.bz2 | |
auto import from //branches/cupcake/...@127101
Diffstat (limited to 'core/package.mk')
| -rw-r--r-- | core/package.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/core/package.mk b/core/package.mk index ba41495..32f394f 100644 --- a/core/package.mk +++ b/core/package.mk @@ -65,9 +65,11 @@ LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets endif ifeq (,$(LOCAL_RESOURCE_DIR)) -LOCAL_RESOURCE_DIR := $(wildcard $(addsuffix /$(LOCAL_PATH)/res, $(PRODUCT_PACKAGE_OVERLAYS))) \ - $(LOCAL_PATH)/res + LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res endif +LOCAL_RESOURCE_DIR := \ + $(wildcard $(addsuffix /$(LOCAL_RESOURCE_DIR), $(PRODUCT_PACKAGE_OVERLAYS))) \ + $(LOCAL_RESOURCE_DIR) # this is an app, so add the system libraries to the search path LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) @@ -77,8 +79,14 @@ LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) all_assets := $(call find-subdir-assets,$(LOCAL_ASSET_DIR)) all_assets := $(addprefix $(LOCAL_ASSET_DIR)/,$(patsubst assets/%,%,$(all_assets))) -all_resources := $(call find-subdir-assets,$(LOCAL_RESOURCE_DIR)) -all_resources := $(addprefix $(LOCAL_RESOURCE_DIR)/,$(patsubst res/%,%,$(all_resources))) +all_resources := $(strip \ + $(foreach dir, $(LOCAL_RESOURCE_DIR), \ + $(addprefix $(dir)/, \ + $(patsubst res/%,%, \ + $(call find-subdir-assets,$(dir)) \ + ) \ + ) \ + )) all_res_assets := $(strip $(all_assets) $(all_resources)) |