diff options
| author | keunyoung <keunyoung@google.com> | 2013-07-25 18:20:09 -0700 |
|---|---|---|
| committer | keunyoung <keunyoung@google.com> | 2013-07-25 18:22:43 -0700 |
| commit | a219bdc0ba22c5e4a37f4367f16e7874510d0e78 (patch) | |
| tree | a75898a5209524e21dde7e8afea53cde4b17acc0 /core/pdk_config.mk | |
| parent | 45924686eb5ade0495b27de3e63809e9df7aa014 (diff) | |
| download | build-a219bdc0ba22c5e4a37f4367f16e7874510d0e78.zip build-a219bdc0ba22c5e4a37f4367f16e7874510d0e78.tar.gz build-a219bdc0ba22c5e4a37f4367f16e7874510d0e78.tar.bz2 | |
fix build
- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy
bug: 10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8
Diffstat (limited to 'core/pdk_config.mk')
| -rw-r--r-- | core/pdk_config.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/pdk_config.mk b/core/pdk_config.mk index cc39105..cdd2a76 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -118,14 +118,14 @@ $(PRODUCT_OUT)/% : $(_pdk_fusion_intermediates)/% $(_pdk_fusion_stamp) ifeq (true,$(TARGET_BUILD_PDK_JAVA_PLATFORM)) -define JAVA_dependency_template +PDK_FUSION_OUT_DIR := $(OUT_DIR) ifeq (debug,$(TARGET_BUILD_TYPE)) PDK_FUSION_OUT_DIR := $(DEBUG_OUT_DIR) -else -PDK_FUSION_OUT_DIR := $(OUT_DIR) endif + +define JAVA_dependency_template $(PDK_FUSION_OUT_DIR)/$(strip $(1)): $(_pdk_fusion_intermediates)/$(strip $(1)) \ - $(PDK_FUSION_OUT_DIR)/$(strip $(2)) $(_pdk_fusion_stamp) + $(PDK_FUSION_OUT_DIR)/$(strip $(2)) $(_pdk_fusion_stamp) @mkdir -p $$(dir $$@) $(hide) cp -fpPR $$< $$@ endef |