commit 0838a7d4163b537eb775ce59e62dd0992c85cb26
author Erik Kline <ek@google.com> Tue May 29 15:50:40 2018 +0900
committer Colin Cross <ccross@android.com> Tue May 29 14:16:38 2018 +0000
tree 6d59b5b7b7378ec1799f812fa4fe483105ce92df
parent 4ed5bf7be3add272aead149b448cc11fa141ba60

Default to AAPT2 = false in AOSP only

Bug: 80404630
Test: booted and launcher didn't crash
Merged-In: I2edc3c9ba8e3e7616ea39c4ebf1fe6e65f113090
Change-Id: Ic90717d81b00698f7ab068fb075b92626df614c9

Android.mk

diff --git a/Android.mk b/Android.mk
index d41e184..f551e75 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,6 +21,9 @@
 #
 include $(CLEAR_VARS)
 
+# TODO(b/80404630): Remove when Launcher3 works with AAPT2
+LOCAL_USE_AAPT2 := false
+
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -67,6 +70,9 @@
 #
 include $(CLEAR_VARS)
 
+# TODO(b/80404630): Remove when Launcher3 works with AAPT2
+LOCAL_USE_AAPT2 := false
+
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := \