commit 09db0149a04d5f5023b20b610e003d480b79a43d
author Colin Cross <ccross@android.com> Tue May 29 17:45:38 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 29 17:45:38 2018 -0700
tree fd1d652b21fa61ae5557c297fb3e1ac41add19ec
parent a58015e7e5dc2084eaace620d2b506ec3e12a7cf
parent 035c5a35a6bf9d63f86e87c29c01e8f67d5d8039

Merge "Revert "Default to AAPT2 = false in AOSP only""
am: 035c5a35a6

Change-Id: Ie75f91869a8251fa3920094fd6389d88d97e96df

Android.mk

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