From 80ceadc94526d6c48c0022bf25281bb522914a3d Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 7 Mar 2016 11:27:20 -0800 Subject: [PATCH] Fix dumping variables of absolute paths. Calling $(abspath) is better than checking and prepending $(PWD) if necessary. Bug: 27429759 Change-Id: Ia156f8a5d6b88b6090f4d23c7f9166bd62d3ab70 --- core/dumpvar.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 36fd08a7c..1bd477765 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -70,11 +70,7 @@ ifdef dumpvar_goals absolute_dumpvar := $(strip $(filter abs-%,$(dumpvar_goals))) ifdef absolute_dumpvar dumpvar_goals := $(patsubst abs-%,%,$(dumpvar_goals)) - ifneq ($(filter /%,$($(dumpvar_goals))),) - DUMPVAR_VALUE := $($(dumpvar_goals)) - else - DUMPVAR_VALUE := $(PWD)/$($(dumpvar_goals)) - endif + DUMPVAR_VALUE := $(abspath $($(dumpvar_goals))) dumpvar_target := dumpvar-abs-$(dumpvar_goals) else DUMPVAR_VALUE := $($(dumpvar_goals)) @@ -115,7 +111,7 @@ ifneq ($(filter report_config, $(DUMP_MANY_VARS)),) @echo "$(DUMP_VAR_PREFIX)report_config=\`$(report_config_sh)\`" endif @$(foreach v, $(sort $(DUMP_MANY_ABS_VARS)),\ - echo "$(DUMP_ABS_VAR_PREFIX)$(v)='$(PWD)/$($(v))'";) + echo "$(DUMP_ABS_VAR_PREFIX)$(v)='$(abspath $($(v)))'";) endif # CALLED_FROM_SETUP -- 2.11.0