commit 5eca469669e1160a166a10f1ffcb7510ae73b3e5
author Erik Kline <ek@google.com> Tue May 29 09:04:35 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 29 09:04:35 2018 -0700
tree 6d59b5b7b7378ec1799f812fa4fe483105ce92df
parent 8bc750eb629cbce0b6269bddda49240c80f0b2d9
parent 6146e2862870f4e83267e95d0ec90fdbf0f3f561

Merge "Default to AAPT2 = false in AOSP only"
am: 6146e28628

Change-Id: I15ce6a49f40ebf190c021b60a3e1abff31bc0a9c

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 := \