diff options
| author | Colin Cross <ccross@android.com> | 2018-08-31 11:18:15 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-09-13 22:25:58 -0700 |
| commit | f5c86dc1c113dc2a898311ee4d446a9ab3ed8e72 (patch) | |
| tree | b1ee1e980f9fcec240b0380e15a02fbf53ce8690 /packages/CtsShim | |
| parent | 00d5548355ed5a15219ad848ab7a947ea54f82de (diff) | |
Remove workarounds for b/79755007
aapt2 now recognizes these manifest elements.
Bug: 79755007
Test: m checkbuild
Change-Id: I2718fc973e08e7f5226b009807312bd534216f8d
Diffstat (limited to 'packages/CtsShim')
| -rw-r--r-- | packages/CtsShim/build/Android.mk | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/packages/CtsShim/build/Android.mk b/packages/CtsShim/build/Android.mk index e645adc60b7c..03eb0d9aad5a 100644 --- a/packages/CtsShim/build/Android.mk +++ b/packages/CtsShim/build/Android.mk @@ -67,10 +67,6 @@ LOCAL_MULTILIB := both LOCAL_JNI_SHARED_LIBRARIES := libshim_jni 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): Remove when AAPT2 recognizes the manifest elements. -LOCAL_AAPT_FLAGS += --warn-manifest-validation include $(BUILD_PACKAGE) @@ -113,10 +109,6 @@ LOCAL_PACKAGE_NAME := CtsShim LOCAL_MANIFEST_FILE := shim/AndroidManifest.xml 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): Remove when AAPT2 recognizes the manifest elements. -LOCAL_AAPT_FLAGS += --warn-manifest-validation include $(BUILD_PACKAGE) |