Merge "Default to AAPT2 = false in AOSP only"

2018-05-29 15:55:02 +00:00
parent 4ed5bf7be3 0838a7d416
commit 6146e28628
1 changed files with 6 additions and 0 deletions
@@ -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 := \