Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03f9c8d9 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

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

am: 9fd9183e

Change-Id: Ie9d6da79223b3e329b7b44ec18382482580684f1
parents badacbd5 9fd9183e

core/definitions.mk

+3 −1
Original line number Diff line number Diff line
@@ -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