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 /tests/ActivityTests | |
| 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 'tests/ActivityTests')
| -rw-r--r-- | tests/ActivityTests/Android.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/ActivityTests/Android.mk b/tests/ActivityTests/Android.mk index 4c68c8bb40c2..94294f6b062a 100644 --- a/tests/ActivityTests/Android.mk +++ b/tests/ActivityTests/Android.mk @@ -10,9 +10,5 @@ LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform 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): Remove when AAPT2 recognizes the manifest elements. -LOCAL_AAPT_FLAGS += --warn-manifest-validation include $(BUILD_PACKAGE) |