diff options
| author | 2024-10-02 19:07:30 +0000 | |
|---|---|---|
| committer | 2024-10-02 19:07:30 +0000 | |
| commit | 75899a71ad8efe83b2a681e7f331af8e649aab73 (patch) | |
| tree | ef8306b90a1365330fbfa83b5335788fffc28a72 | |
| parent | ac2f03ec763f6caaf199480d1fb3bf958875cf57 (diff) | |
| parent | ede7750e9b178288e6a7415507ae34e07e153604 (diff) | |
Merge "[Ravenwood] Prevent dexmaker from going into Ravenwood tests" into main
| -rw-r--r-- | core/tests/coretests/Android.bp | 2 | ||||
| -rw-r--r-- | core/tests/utiltests/Android.bp | 2 | ||||
| -rw-r--r-- | services/tests/servicestests/Android.bp | 14 |
3 files changed, 16 insertions, 2 deletions
diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp index a9ac67db2cbc..7af307317fc5 100644 --- a/core/tests/coretests/Android.bp +++ b/core/tests/coretests/Android.bp @@ -245,7 +245,7 @@ android_ravenwood_test { "androidx.test.rules", "androidx.test.ext.junit", "androidx.test.uiautomator_uiautomator", - "compatibility-device-util-axt", + "compatibility-device-util-axt-ravenwood", "flag-junit", "platform-test-annotations", "flag-junit", diff --git a/core/tests/utiltests/Android.bp b/core/tests/utiltests/Android.bp index cdc8a9e06d0b..7cf49ab5c376 100644 --- a/core/tests/utiltests/Android.bp +++ b/core/tests/utiltests/Android.bp @@ -61,7 +61,7 @@ android_ravenwood_test { "androidx.annotation_annotation", "androidx.test.rules", "frameworks-base-testutils", - "servicestests-utils", + "servicestests-utils-ravenwood", ], srcs: [ "src/android/util/IRemoteMemoryIntArray.aidl", diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index d0b23a0f2dbb..d336c9962c17 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -223,6 +223,20 @@ java_library { } java_library { + name: "servicestests-utils-ravenwood", + srcs: [ + "utils/**/*.java", + "utils/**/*.kt", + "utils-mockito/**/*.kt", + ], + libs: [ + "android.test.runner.stubs.system", + "junit", + "mockito-ravenwood-prebuilt", + ], +} + +java_library { name: "mockito-test-utils", srcs: [ "utils-mockito/**/*.kt", |