diff options
| author | Colin Cross <ccross@android.com> | 2018-05-29 23:31:12 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-29 23:31:12 -0700 |
| commit | 872accd1e04901f6fe2ed1fcec8048350aa1d36e (patch) | |
| tree | 49931e7f6ee24c9abbd3bde52a27d7e5a5d72ab9 | |
| parent | 59e792baebd23551138e0e7895f5b85fbffb29bf (diff) | |
| parent | da6fcd1f9af15168964086ec9c4a4a1c8bfadf5a (diff) | |
Merge "Use AAPT2 for more modules with manifest validation errors" am: ce1979d707
am: da6fcd1f9a
Change-Id: Ib73e574214064ba0c4112e901d9997724ecd7cb8
| -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) |