diff options
| author | 2018-05-21 14:51:40 -0700 | |
|---|---|---|
| committer | 2018-05-21 14:51:40 -0700 | |
| commit | 0cdc6edb51c1c480e8584ab44647292b5924bd31 (patch) | |
| tree | 7b305ccae0f4331a131729d632adb2e3da75f4f4 | |
| parent | 8fd234045d21ae34636b2648832a7fb5881c7fee (diff) | |
| parent | 59fa1bcf69bd821e25cbb04ca91ab326c9cdf344 (diff) | |
Merge "Use AAPT2 for modules with manifest validation errors"
am: 59fa1bcf69
Change-Id: I1ae5e646a5c519860450ef1bbef72aacb2c1e915
4 files changed, 17 insertions, 12 deletions
diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index b49f5a93898b..a97e79bda4ab 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -49,10 +49,12 @@ 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. +# Disable AAPT2 because the hacks below depend on the AAPT rules implementation LOCAL_USE_AAPT2 := false +# When AAPT2 is enabled it will need --warn-manifest-validation to fix: +# frameworks/base/core/tests/coretests/AndroidManifest.xml:26: error: unknown element <meta-data> found. +# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements. +# LOCAL_AAPT_FLAGS += --warn-manifest-validation include $(BUILD_PACKAGE) # Rules to copy all the test apks to the intermediate raw resource directory diff --git a/core/tests/coretests/apks/install_multi_package/Android.mk b/core/tests/coretests/apks/install_multi_package/Android.mk index 764bc5aba9ee..97275931be4b 100644 --- a/core/tests/coretests/apks/install_multi_package/Android.mk +++ b/core/tests/coretests/apks/install_multi_package/Android.mk @@ -7,10 +7,11 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := install_multi_package -# Disable AAPT2 to fix: +LOCAL_USE_AAPT2 := true +# Disable AAPT2 manifest checks 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 +# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements. +LOCAL_AAPT_FLAGS += --warn-manifest-validation 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 c24337213910..679327c9b0df 100644 --- a/core/tests/coretests/apks/install_verifier_bad/Android.mk +++ b/core/tests/coretests/apks/install_verifier_bad/Android.mk @@ -5,9 +5,10 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := install_verifier_bad -# Disable AAPT2 to fix: +LOCAL_USE_AAPT2 := true +# Disable AAPT2 manifest checks 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 +# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements. +LOCAL_AAPT_FLAGS += --warn-manifest-validation 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 8e9ab4659aca..7d621b32900b 100644 --- a/core/tests/coretests/apks/install_verifier_good/Android.mk +++ b/core/tests/coretests/apks/install_verifier_good/Android.mk @@ -5,9 +5,10 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := install_verifier_good -# Disable AAPT2 to fix: +LOCAL_USE_AAPT2 := true +# Disable AAPT2 manifest checks 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 +# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements. +LOCAL_AAPT_FLAGS += --warn-manifest-validation include $(FrameworkCoreTests_BUILD_PACKAGE) |