diff options
| author | Colin Cross <ccross@android.com> | 2018-05-16 09:21:18 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-05-16 09:34:26 -0700 |
| commit | 940b98ee4e4eabee452d8d28ba7d59e330f99866 (patch) | |
| tree | 735ab754b6005466f46bc62eab1ef8d813fdad65 /packages/CtsShim | |
| parent | 001d2aed314f92c96db5b7d2023bfc7cdd061413 (diff) | |
Disable AAPT2 for modules that use missing features
Use LOCAL_USE_AAPT2 := false to disable AAPT2 for modules that
use features that are not implemented in AAPT2.
Fixes:
frameworks/base/core/tests/coretests/apks/install_multi_package/AndroidManifest.xml:46: error: unexpected element <package> found in <manifest>.
frameworks/base/core/tests/coretests/apks/install_multi_package/AndroidManifest.xml:82: error: unexpected element <package> found in <manifest>.
frameworks/base/core/tests/coretests/apks/install_verifier_bad/AndroidManifest.xml:19: error: unexpected element <package-verifier> found in <manifest>.
frameworks/base/core/tests/coretests/apks/install_verifier_good/AndroidManifest.xml:19: error: unexpected element <package-verifier> found in <manifest>.
frameworks/base/packages/CtsShim/build/shim/AndroidManifest.xml:25: error: unexpected element <restrict-update> found in <manifest>.
frameworks/base/tests/ActivityTests/AndroidManifest.xml:42: error: unexpected element <preferred> found in <manifest><application><activity>.
out/target/common/obj/APPS/CtsShimPriv_intermediates/AndroidManifest.xml:25: error: unexpected element <restrict-update> found in <manifest>.
frameworks/base/core/tests/coretests/AndroidManifest.xml:26: error: unexpected element <meta-data> found in <manifest><permission>.
...
Bug: 79755007
Test: m FORCE_AAPT2=true java
Change-Id: I393b697c521ab2a4fbc00b29a43aed6b4729b9a8
Diffstat (limited to 'packages/CtsShim')
| -rw-r--r-- | packages/CtsShim/build/Android.mk | 10 |
1 files changed, 10 insertions, 0 deletions
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) ########################################################### |