p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

am: 9fd9183e66

Change-Id: Ie9d6da79223b3e329b7b44ec18382482580684f1
This commit is contained in:
Colin Cross 2018-07-31 19:52:15 -07:00 committed by android-build-merger
parent badacbd5c5 9fd9183e66
commit 03f9c8d96a
1 changed files with 3 additions and 1 deletions
Show Stats 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
# 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