diff options
| author | Colin Cross <ccross@android.com> | 2018-05-18 09:50:29 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-05-26 10:32:26 -0700 |
| commit | 2f4bf5423d742ca6df4488d9df61f794ea2e82f1 (patch) | |
| tree | 8c465ddf0fa0a58ef9fb4e5b4798701531a4e804 | |
| parent | daff857ffd12e7df74b162714ef58dcc5071592e (diff) | |
Use AAPT2 for more modules with manifest validation errors
Add LOCAL_AAPT_FLAGS += --warn-manifest-validation to the modules
that have manifests that AAPT2 can't parse.
Bug: 79755007
Test: m checkbuild
Change-Id: I5f20ca582e481f7dac7b6a236662a2d1f47ea9fa
| -rw-r--r-- | packages/CtsShim/build/Android.mk | 14 | ||||
| -rw-r--r-- | tests/ActivityTests/Android.mk | 7 |
2 files changed, 12 insertions, 9 deletions
diff --git a/packages/CtsShim/build/Android.mk b/packages/CtsShim/build/Android.mk index 6186a784f854..e645adc60b7c 100644 --- a/packages/CtsShim/build/Android.mk +++ b/packages/CtsShim/build/Android.mk @@ -66,10 +66,11 @@ LOCAL_FULL_MANIFEST_FILE := $(gen) LOCAL_MULTILIB := both LOCAL_JNI_SHARED_LIBRARIES := libshim_jni -# Disable AAPT2 to fix: +LOCAL_USE_AAPT2 := true +# Disable AAPT2 manifest checks 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 +# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements. +LOCAL_AAPT_FLAGS += --warn-manifest-validation include $(BUILD_PACKAGE) @@ -111,10 +112,11 @@ LOCAL_PACKAGE_NAME := CtsShim LOCAL_MANIFEST_FILE := shim/AndroidManifest.xml -# Disable AAPT2 to fix: +LOCAL_USE_AAPT2 := true +# Disable AAPT2 manifest checks 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 +# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements. +LOCAL_AAPT_FLAGS += --warn-manifest-validation include $(BUILD_PACKAGE) diff --git a/tests/ActivityTests/Android.mk b/tests/ActivityTests/Android.mk index 61dbcc36fd2c..4c68c8bb40c2 100644 --- a/tests/ActivityTests/Android.mk +++ b/tests/ActivityTests/Android.mk @@ -9,9 +9,10 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform -# Disable AAPT2 to fix: +LOCAL_USE_AAPT2 := true +# Disable AAPT2 manifest checks 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 +# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements. +LOCAL_AAPT_FLAGS += --warn-manifest-validation include $(BUILD_PACKAGE) |