diff options
| -rw-r--r-- | core/tests/coretests/Android.mk | 5 | ||||
| -rw-r--r-- | core/tests/coretests/apks/install_multi_package/Android.mk | 5 | ||||
| -rw-r--r-- | core/tests/coretests/apks/install_verifier_bad/Android.mk | 5 | ||||
| -rw-r--r-- | core/tests/coretests/apks/install_verifier_good/Android.mk | 5 | ||||
| -rw-r--r-- | packages/CtsShim/build/Android.mk | 10 | ||||
| -rw-r--r-- | tests/ActivityTests/Android.mk | 5 |
6 files changed, 35 insertions, 0 deletions
diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index a802e75b5227..b49f5a93898b 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -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/, \ diff --git a/core/tests/coretests/apks/install_multi_package/Android.mk b/core/tests/coretests/apks/install_multi_package/Android.mk index 2813dad2339a..764bc5aba9ee 100644 --- a/core/tests/coretests/apks/install_multi_package/Android.mk +++ b/core/tests/coretests/apks/install_multi_package/Android.mk @@ -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) diff --git a/core/tests/coretests/apks/install_verifier_bad/Android.mk b/core/tests/coretests/apks/install_verifier_bad/Android.mk index a6f9d5bac701..c24337213910 100644 --- a/core/tests/coretests/apks/install_verifier_bad/Android.mk +++ b/core/tests/coretests/apks/install_verifier_bad/Android.mk @@ -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) diff --git a/core/tests/coretests/apks/install_verifier_good/Android.mk b/core/tests/coretests/apks/install_verifier_good/Android.mk index 6f2d44f61114..8e9ab4659aca 100644 --- a/core/tests/coretests/apks/install_verifier_good/Android.mk +++ b/core/tests/coretests/apks/install_verifier_good/Android.mk @@ -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) diff --git a/packages/CtsShim/build/Android.mk b/packages/CtsShim/build/Android.mk index ec14d50b371d..6186a784f854 100644 --- a/packages/CtsShim/build/Android.mk +++ b/packages/CtsShim/build/Android.mk @@ -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) ########################################################### diff --git a/tests/ActivityTests/Android.mk b/tests/ActivityTests/Android.mk index 274fc5fcf471..61dbcc36fd2c 100644 --- a/tests/ActivityTests/Android.mk +++ b/tests/ActivityTests/Android.mk @@ -9,4 +9,9 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform +# Disable AAPT2 to fix: +# frameworks/base/tests/ActivityTests/AndroidManifest.xml:42: error: unexpected element <preferred> found in <manifest><application><activity>. +# TODO(b/79755007): Re-enable AAPT2 when it supports the missing features. +LOCAL_USE_AAPT2 := false + include $(BUILD_PACKAGE) |