Merge "Update to /external/robolectric rather than older /external/robolectric-shadows" am: 19bde5b0da
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2492286 Change-Id: Ic1b0293d5b326bf1590b3a258e6489927e26d07e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -35,4 +35,5 @@ android_robolectric_test {
|
||||
// timeout in seconds.
|
||||
timeout: 36000,
|
||||
},
|
||||
}
|
||||
upstream: true,
|
||||
}
|
||||
|
||||
@@ -42,15 +42,14 @@ android_robolectric_test {
|
||||
"androidx.lifecycle_lifecycle-runtime",
|
||||
"androidx.mediarouter_mediarouter-nodeps",
|
||||
"error_prone_annotations",
|
||||
"mockito-robolectric-prebuilt",
|
||||
"service-nearby-pre-jarjar",
|
||||
"truth-prebuilt",
|
||||
"robolectric_android-all-stub",
|
||||
"Robolectric_all-target",
|
||||
],
|
||||
|
||||
test_options: {
|
||||
// timeout in seconds.
|
||||
timeout: 36000,
|
||||
},
|
||||
upstream: true,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user