diff options
| author | 2024-10-17 01:56:55 +0000 | |
|---|---|---|
| committer | 2024-10-17 01:56:55 +0000 | |
| commit | 8ac5a154991dfb870ec3de48c6fe53cd99e3fe31 (patch) | |
| tree | 19c206e52f58659072cbbf34c84230904d173a78 | |
| parent | d66ed506300bb7065fc6688dd48d4a64f264b88e (diff) | |
| parent | 16844470ecf0bfa8a35fbe597f5c1019f9bb6554 (diff) | |
Merge "Add back non-ravenzier part of bivalent device side test" into main am: edf2992fcf am: 16844470ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3312037
Change-Id: I65be9bef3cb4b71ed9c2d36c2f3e89f2c313b087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | ravenwood/tests/bivalenttest/Android.bp | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/ravenwood/tests/bivalenttest/Android.bp b/ravenwood/tests/bivalenttest/Android.bp index ac499b966afe..d7f4b3e2955d 100644 --- a/ravenwood/tests/bivalenttest/Android.bp +++ b/ravenwood/tests/bivalenttest/Android.bp @@ -54,34 +54,36 @@ android_ravenwood_test { auto_gen_config: true, } -// TODO(b/371215487): migrate bivalenttest.ravenizer tests to another architecture +android_test { + name: "RavenwoodBivalentTest_device", -// android_test { -// name: "RavenwoodBivalentTest_device", -// -// srcs: [ -// "test/**/*.java", -// ], -// static_libs: [ -// "junit", -// "truth", -// -// "androidx.annotation_annotation", -// "androidx.test.ext.junit", -// "androidx.test.rules", -// -// "junit-params", -// "platform-parametric-runner-lib", -// -// "ravenwood-junit", -// ], -// jni_libs: [ -// "libravenwoodbivalenttest_jni", -// ], -// test_suites: [ -// "device-tests", -// ], -// optimize: { -// enabled: false, -// }, -// } + srcs: [ + "test/**/*.java", + ], + // TODO(b/371215487): migrate bivalenttest.ravenizer tests to another architecture + exclude_srcs: [ + "test/**/ravenizer/*.java", + ], + static_libs: [ + "junit", + "truth", + + "androidx.annotation_annotation", + "androidx.test.ext.junit", + "androidx.test.rules", + + "junit-params", + "platform-parametric-runner-lib", + + "ravenwood-junit", + ], + jni_libs: [ + "libravenwoodbivalenttest_jni", + ], + test_suites: [ + "device-tests", + ], + optimize: { + enabled: false, + }, +} |