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

Commit 1ed070a5 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Allow modules to override FORCE_AAPT2=true with LOCAL_USE_AAPT2 := false" 

am: 00794848

Change-Id: I267704b653a8cd2fd1b2749e70f7183b7de55eaf
parents 86091aab 00794848

core/force_aapt2.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
# rewriting some properties to convert standard AAPT usage to AAPT2.



ifeq ($(FORCE_AAPT2),true)

  ifneq ($(LOCAL_USE_AAPT2),true)

  ifeq ($(LOCAL_USE_AAPT2),)

    # Force AAPT2 on

    LOCAL_USE_AAPT2 := true

    # Move LOCAL_STATIC_JAVA_AAR_LIBRARIES to LOCAL_STATIC_ANDROID_LIBRARIES