commit ca52cd4b643e46f258ac393f2e3c78c52371b8b0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 01 02:44:27 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 01 02:44:27 2018 +0000
tree 465abf562cc2676f450144eb980af241afd1ae93
parent 11b4a97ad80c1114954aa7d19ab2ac0e9821c026
parent 0cade209180106f277b6f10fefa76cb0daa9ffd2

Merge "aapt2: use clean-path on paths to resource files"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 514239b..b0c5db0 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2114,7 +2114,9 @@
 # $(2): the base dir of the output file path
 # Returns: the compiled output file path
 define aapt2-compiled-resource-out-file
-$(eval _p_w := $(strip $(subst /,$(space),$(dir $(1)))))$(2)/$(subst $(space),/,$(_p_w))_$(if $(filter values%,$(lastword $(_p_w))),$(patsubst %.xml,%.arsc,$(notdir $(1))),$(notdir $(1))).flat
+$(strip \
+  $(eval _p_w := $(strip $(subst /,$(space),$(dir $(call clean-path,$(1))))))
+  $(2)/$(subst $(space),/,$(_p_w))_$(if $(filter values%,$(lastword $(_p_w))),$(patsubst %.xml,%.arsc,$(notdir $(1))),$(notdir $(1))).flat)
 endef
 
 define aapt2-link