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

am: 035c5a35a6

Change-Id: Ie75f91869a8251fa3920094fd6389d88d97e96df
This commit is contained in:
Colin Cross
2018-05-29 17:45:38 -07:00
committed by android-build-merger
-6
View File
@@ -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 := \