commit 60767620c35b569559a14e50ebc27896d8202779
author Tom Cherry <tcherry@nvidia.com> Thu Jun 14 17:33:38 2012 -0700
committer keunyoung <keunyoung@google.com> Wed Jul 24 13:55:56 2013 -0700
tree 520a3bcab2541a5630139e0bcac38271279c3f3a
parent 3939476ca01c3af2abc52a5912eb6323d583df6a

Fix issue with DEBUG_OUT_DIR not properly selected

- patch from NVDIA

bug: 9968564

Change-Id: I2082f989d75fb168fb42947d723de093beff4ff1
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Simone Willett <swillett@nvidia.com>

core/pdk_config.mk

diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index da55b38..cc39105 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -119,8 +119,13 @@
 ifeq (true,$(TARGET_BUILD_PDK_JAVA_PLATFORM))
 
 define JAVA_dependency_template
-$(OUT_DIR)/$(strip $(1)): $(_pdk_fusion_intermediates)/$(strip $(1)) $(OUT_DIR)/$(strip $(2)) \
-  $(_pdk_fusion_stamp)
+ifeq (debug,$(TARGET_BUILD_TYPE))
+PDK_FUSION_OUT_DIR := $(DEBUG_OUT_DIR)
+else
+PDK_FUSION_OUT_DIR := $(OUT_DIR)
+endif
+$(PDK_FUSION_OUT_DIR)/$(strip $(1)): $(_pdk_fusion_intermediates)/$(strip $(1)) \
+ $(PDK_FUSION_OUT_DIR)/$(strip $(2)) $(_pdk_fusion_stamp)
 	@mkdir -p $$(dir $$@)
 	$(hide) cp -fpPR $$< $$@
 endef