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"

Browse Source 
am: e3c456423e

Change-Id: Icf3c863ea6cf7d9fb0bd09e8b242812c947c0bac
This commit is contained in:
Colin Cross
2018-05-17 12:07:28 -07:00
committed by android-build-merger
parent 195be3d799 e3c456423e
commit 4ab479a771
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/%,\
$(LOCAL_RESOURCE_DIR))
# Filter out unnecessary aapt flags
ifneq (,$(filter --extra-packages,$(LOCAL_AAPT_FLAGS)))
LOCAL_AAPT_FLAGS := $(subst --extra-packages=,--extra-packages$(space), \
$(filter-out \
--extra-packages=android.support.% \
--extra-packages=androidx.% \
--auto-add-overlay,\
--extra-packages=androidx.%, \
$(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
# added in current, so always treat LOCAL_SDK_VERSION as LOCAL_SDK_RES_VERSION := current.