StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ca52cd4b64

Change-Id: Id9be0878060f306e26abce4503f8ab958f675c10
This commit is contained in:
Colin Cross
2018-07-31 19:48:06 -07:00
committed by android-build-merger
parent 8c5710a0af ca52cd4b64
commit 9fd9183e66
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/definitions.mk
View File

@@ -2114,7 +2114,9 @@ endef
# $(2): the base dir of the output file path # $(2): the base dir of the output file path
# Returns: the compiled output file path # Returns: the compiled output file path
define aapt2-compiled-resource-out-file 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 endef
define aapt2-link define aapt2-link