Merge "Fix issue with DEBUG_OUT_DIR not properly selected"

This commit is contained in:
Keun-young Park 2013-07-24 22:06:49 +00:00 committed by Android (Google) Code Review
commit efc88c0596

View file

@ -119,8 +119,13 @@ $(PRODUCT_OUT)/% : $(_pdk_fusion_intermediates)/% $(_pdk_fusion_stamp)
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