From a219bdc0ba22c5e4a37f4367f16e7874510d0e78 Mon Sep 17 00:00:00 2001 From: keunyoung Date: Thu, 25 Jul 2013 18:20:09 -0700 Subject: [PATCH] fix build - PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy bug: 10023069 Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8 --- core/pdk_config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/pdk_config.mk b/core/pdk_config.mk index cc3910501..cdd2a769f 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 -- 2.11.0