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

Commit d0b1977f authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 0138951e: Collapse multiple --extra-packages into one. 

* commit '0138951e':
  Collapse multiple --extra-packages into one.
parents ab529f13 0138951e

core/base_rules.mk

+19 −4
Original line number Diff line number Diff line
@@ -447,6 +447,21 @@ $(cleantarget):: 
## Common definitions for module.

###########################################################



# aapt doesn't accept multiple --extra-packages flags.

# We have to collapse them into a single --extra-packages flag here.

LOCAL_AAPT_FLAGS := $(strip $(LOCAL_AAPT_FLAGS))

ifdef LOCAL_AAPT_FLAGS

ifeq ($(filter 0 1,$(words $(filter --extra-packages,$(LOCAL_AAPT_FLAGS)))),)

aapt_flags := $(subst --extra-packages$(space),--extra-packages@,$(LOCAL_AAPT_FLAGS))

aapt_flags_extra_packages := $(patsubst --extra-packages@%,%,$(filter --extra-packages@%,$(aapt_flags)))

aapt_flags_extra_packages := $(sort $(subst :,$(space),$(aapt_flags_extra_packages)))

LOCAL_AAPT_FLAGS := $(filter-out --extra-packages@%,$(aapt_flags)) \

    --extra-packages $(subst $(space),:,$(aapt_flags_extra_packages))

aapt_flags_extra_packages :=

aapt_flags :=

endif

endif



# Propagate local configuration options to this target.

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_PATH:=$(LOCAL_PATH)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS:= $(LOCAL_AAPT_FLAGS)