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

Commit 282065ab authored by Colin Cross's avatar Colin Cross
Browse files

Don't always filter out --auto-add-overlay 

There are some cases where --auto-add-overlay is added for legitimite
reasons, for example in RROs.  Only filter it out from modules that
were using --extra-packages for support library modules.

Test: m FORCE_AAPT2=true java
Change-Id: I165fa577f2204ecbc57e71f946db3f346568ad81
parent e2f541bb

core/force_aapt2.mk

+10 −6
Original line number Diff line number Diff line
@@ -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.