diff options
| author | Colin Cross <ccross@android.com> | 2018-05-16 14:14:27 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-16 14:14:27 -0700 |
| commit | 3667bf48761c9f6f716c42f681b7ca002115dfa2 (patch) | |
| tree | 513cbfce11faee958be4d47d910459831c5cfead /tests | |
| parent | dbe6d50990ec7e85f64b8db0d96db08205eeebb7 (diff) | |
| parent | 1d9a9610ae1fe77cdb7364d5c1a741d1d1c48e1a (diff) | |
Merge "Disable AAPT2 for modules that use missing features" am: 87dc8d6576
am: 1d9a9610ae
Change-Id: Iba6ee4996c11d66fa7e6f510b0213b2e61f30524
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ActivityTests/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/ActivityTests/Android.mk b/tests/ActivityTests/Android.mk index 274fc5fcf471..61dbcc36fd2c 100644 --- a/tests/ActivityTests/Android.mk +++ b/tests/ActivityTests/Android.mk @@ -9,4 +9,9 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform +# Disable AAPT2 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 + include $(BUILD_PACKAGE) |