commit d443244fbf3ee02f6d370509c83e39c2046ac4dd
author Colin Cross <ccross@android.com> Tue May 15 15:25:20 2018 -0700
committer Colin Cross <ccross@android.com> Tue May 15 15:28:22 2018 -0700
tree 75e57e38d0dd2b0ce47f36768c5e3e3fdf7f8ca9
parent 532ae3bcfba91657592dc9415d7a776cf1f9c775

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

Bug: 79481102
Test: m java FORCE_AAPT2=true
Change-Id: Iece2158dc887a249eb51086b2497b170b5879979

core/force_aapt2.mk

diff --git a/core/force_aapt2.mk b/core/force_aapt2.mk
index 655ccf5..41bf710 100644
--- a/core/force_aapt2.mk
+++ b/core/force_aapt2.mk
@@ -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