Merge "Default to AAPT2 = false in AOSP only" (6146e286) · Commits · e / os / android_packages_apps_Trebuchet

Android.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -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 := \