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

Merge "Don't always filter out --auto-add-overlay" am: e3c456423e

Browse Source 
am: 4ab479a771

Change-Id: Icc7d1d911904c36684d89c20881002c3c8978175
This commit is contained in:
Colin Cross
2018-05-17 12:11:34 -07:00
committed by android-build-merger
parent 1dd2190c9b 4ab479a771
commit 8e7d3fb134
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/force_aapt2.mk
View File

@@ -30,12 +30,16 @@ ifeq ($(FORCE_AAPT2),true)
frameworks/support/%,\ frameworks/support/%,\
$(LOCAL_RESOURCE_DIR)) $(LOCAL_RESOURCE_DIR))
# Filter out unnecessary aapt flags # Filter out unnecessary aapt flags
ifneq (,$(filter --extra-packages,$(LOCAL_AAPT_FLAGS)))
LOCAL_AAPT_FLAGS := $(subst --extra-packages=,--extra-packages$(space), \ LOCAL_AAPT_FLAGS := $(subst --extra-packages=,--extra-packages$(space), \
$(filter-out \ $(filter-out \
--extra-packages=android.support.% \ --extra-packages=android.support.% \
--extra-packages=androidx.% \ --extra-packages=androidx.%, \
--auto-add-overlay,\
$(subst --extra-packages$(space),--extra-packages=,$(LOCAL_AAPT_FLAGS)))) $(subst --extra-packages$(space),--extra-packages=,$(LOCAL_AAPT_FLAGS))))
ifeq (,$(filter --extra-packages,$(LOCAL_AAPT_FLAGS)))
LOCAL_AAPT_FLAGS := $(filter-out --auto-add-overlay,$(LOCAL_AAPT_FLAGS))
endif
endif
# AAPT2 is pickier about missing resources. Support library may have references to resources # AAPT2 is pickier about missing resources. Support library may have references to resources
# added in current, so always treat LOCAL_SDK_VERSION as LOCAL_SDK_RES_VERSION := current. # added in current, so always treat LOCAL_SDK_VERSION as LOCAL_SDK_RES_VERSION := current.