commit 035c5a35a6bf9d63f86e87c29c01e8f67d5d8039
author Colin Cross <ccross@android.com> Tue May 29 23:41:34 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 29 23:41:34 2018 +0000
tree fd1d652b21fa61ae5557c297fb3e1ac41add19ec
parent 1179b714807a0c011953125adbaeeb6c76570f63
parent 7ff0d582e1c66d39d441ec7a6b98145cbede674d

Merge "Revert "Default to AAPT2 = false in AOSP only""

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