From 7ff0d582e1c66d39d441ec7a6b98145cbede674d Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 29 May 2018 13:21:43 -0700
Subject: [PATCH] Revert "Default to AAPT2 = false in AOSP only"

I276d22e82dbef65eaa0f6c3331d7990292a62bc9 fixes the underlying
issue that was causing Launcher to crash when building with aapt2.

This reverts commit 0838a7d4163b537eb775ce59e62dd0992c85cb26.

Bug: 80404630
Test: booted and launcher didn't crash
Change-Id: I77e231b000e7c05a631bc44271c203dd698b6873
Merged-In: I2edc3c9ba8e3e7616ea39c4ebf1fe6e65f113090
---
 Android.mk | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Android.mk b/Android.mk
index f551e759ea..d41e184f0a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,9 +21,6 @@ LOCAL_PATH := $(call my-dir)
 #
 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 $(BUILD_PACKAGE)
 #
 include $(CLEAR_VARS)
 
-# TODO(b/80404630): Remove when Launcher3 works with AAPT2
-LOCAL_USE_AAPT2 := false
-
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := \