From 0838a7d4163b537eb775ce59e62dd0992c85cb26 Mon Sep 17 00:00:00 2001
From: Erik Kline <ek@google.com>
Date: Tue, 29 May 2018 15:50:40 +0900
Subject: [PATCH] Default to AAPT2 = false in AOSP only

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

diff --git a/Android.mk b/Android.mk
index d41e184f0a..f551e759ea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,6 +21,9 @@ 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 := \
@@ -67,6 +70,9 @@ 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 := \