Merge "Default to AAPT2 = false in AOSP only"

am: 6146e28628

Change-Id: I15ce6a49f40ebf190c021b60a3e1abff31bc0a9c
This commit is contained in:
Erik Kline
2018-05-29 09:04:35 -07:00
committed by android-build-merger
+6
View File
@@ -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 := \