Merge "Disable AAPT2 for modules that use missing features" (1d9a9610) · Commits · e / os / android_frameworks_base

core/tests/coretests/Android.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,11 @@ LOCAL_CERTIFICATE := platform
		FrameworkCoreTests_intermediates := $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME))/test_apks/res
		LOCAL_RESOURCE_DIR := $(FrameworkCoreTests_intermediates) $(LOCAL_PATH)/res

		# Disable AAPT2 to fix:
		# frameworks/base/core/tests/coretests/AndroidManifest.xml:26: error: unknown element <meta-data> found.
		# TODO(b/79755007): Re-enable AAPT2 when it supports the missing features.
		LOCAL_USE_AAPT2 := false

		include $(BUILD_PACKAGE)
		# Rules to copy all the test apks to the intermediate raw resource directory
		FrameworkCoreTests_all_apks_res := $(addprefix $(FrameworkCoreTests_intermediates)/raw/, \

+5 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,11 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)

		LOCAL_PACKAGE_NAME := install_multi_package

		# Disable AAPT2 to fix:
		# frameworks/base/core/tests/coretests/apks/install_multi_package/AndroidManifest.xml:46: error: unexpected element <package> found in <manifest>.
		# TODO(b/79755007): Re-enable AAPT2 when it supports the missing features.
		LOCAL_USE_AAPT2 := false

		include $(FrameworkCoreTests_BUILD_PACKAGE)
		#include $(BUILD_PACKAGE)

+5 −0

Original line number	Diff line number	Diff line
		@@ -5,4 +5,9 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)

		LOCAL_PACKAGE_NAME := install_verifier_bad

		# Disable AAPT2 to fix:
		# frameworks/base/core/tests/coretests/apks/install_verifier_bad/AndroidManifest.xml:19: error: unexpected element <package-verifier> found in <manifest>.
		# TODO(b/79755007): Re-enable AAPT2 when it supports the missing features.
		LOCAL_USE_AAPT2 := false

		include $(FrameworkCoreTests_BUILD_PACKAGE)

+5 −0

Original line number	Diff line number	Diff line
		@@ -5,4 +5,9 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)

		LOCAL_PACKAGE_NAME := install_verifier_good

		# Disable AAPT2 to fix:
		# frameworks/base/core/tests/coretests/apks/install_verifier_good/AndroidManifest.xml:19: error: unexpected element <package-verifier> found in <manifest>.
		# TODO(b/79755007): Re-enable AAPT2 when it supports the missing features.
		LOCAL_USE_AAPT2 := false

		include $(FrameworkCoreTests_BUILD_PACKAGE)

+10 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,11 @@ LOCAL_FULL_MANIFEST_FILE := $(gen)
		LOCAL_MULTILIB := both
		LOCAL_JNI_SHARED_LIBRARIES := libshim_jni

		# Disable AAPT2 to fix:
		# out/target/common/obj/APPS/CtsShimPriv_intermediates/AndroidManifest.xml:25: error: unexpected element <restrict-update> found in <manifest>.
		# TODO(b/79755007): Re-enable AAPT2 when it supports the missing features.
		LOCAL_USE_AAPT2 := false

		include $(BUILD_PACKAGE)

		###########################################################
		@@ -106,6 +111,11 @@ LOCAL_PACKAGE_NAME := CtsShim

		LOCAL_MANIFEST_FILE := shim/AndroidManifest.xml

		# Disable AAPT2 to fix:
		# frameworks/base/packages/CtsShim/build/shim/AndroidManifest.xml:25: error: unexpected element <restrict-update> found in <manifest>.
		# TODO(b/79755007): Re-enable AAPT2 when it supports the missing features.
		LOCAL_USE_AAPT2 := false

		include $(BUILD_PACKAGE)

		###########################################################