tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* commit 'd0b1977f7d12736a99a99893061948c622b5d8f3':
  Collapse multiple --extra-packages into one.
This commit is contained in:
Ying Wang 2012-11-07 16:33:08 -08:00 committed by Android Git Automerger
commit f99f5e89a1
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/base_rules.mk
View file

@ -435,10 +435,10 @@ endif
cleantarget := clean-$(LOCAL_MODULE) cleantarget := clean-$(LOCAL_MODULE)
$(cleantarget) : PRIVATE_MODULE := $(LOCAL_MODULE) $(cleantarget) : PRIVATE_MODULE := $(LOCAL_MODULE)
$(cleantarget) : PRIVATE_CLEAN_FILES := \ $(cleantarget) : PRIVATE_CLEAN_FILES := \
$(PRIVATE_CLEAN_FILES) \ $(PRIVATE_CLEAN_FILES) \
$(LOCAL_BUILT_MODULE) \ $(LOCAL_BUILT_MODULE) \
$(LOCAL_INSTALLED_MODULE) \ $(LOCAL_INSTALLED_MODULE) \
$(intermediates) $(intermediates)
$(cleantarget):: $(cleantarget)::
@echo "Clean: $(PRIVATE_MODULE)" @echo "Clean: $(PRIVATE_MODULE)"
$(hide) rm -rf $(PRIVATE_CLEAN_FILES) $(hide) rm -rf $(PRIVATE_CLEAN_FILES)
@ -447,6 +447,21 @@ $(cleantarget)::
## Common definitions for module. ## 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. # Propagate local configuration options to this target.
$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_PATH:=$(LOCAL_PATH) $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_PATH:=$(LOCAL_PATH)
$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS:= $(LOCAL_AAPT_FLAGS) $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_AAPT_FLAGS:= $(LOCAL_AAPT_FLAGS)