| commit | ff088a1702b24b5145ccbb3911da94c7c829b940 | [log] [tgz] |
|---|---|---|
| author | Artem Titarenko <artit@webrtc.org> | Wed Nov 28 14:46:40 2018 +0100 |
| committer | Commit Bot <commit-bot@chromium.org> | Wed Nov 28 15:48:15 2018 +0000 |
| tree | 8491e1c83ac16510def55987a20416953ac9cab0 | |
| parent | d5696fb8f529e1b0c1a927baa06386e0186df5ad [diff] [blame] |
Reland "Run robolectric tests for Android on several Android API versions" This is a reland of e598e6bff9528f77dc9f4fb3a5954ec5fb6790b0 The trouble with original CL was caused by improper timeouts. This was fixed here: https://webrtc-review.googlesource.com/c/src/+/111383 Original change's description: > Run robolectric tests for Android on several Android API versions > > Depends on https://bugs.chromium.org/p/chromium/issues/detail?id=901324 > > Bug: webrtc:9955 > Change-Id: I5e3f4c05b8258b90728644846f425ee131fda8d4 > Reviewed-on: https://webrtc-review.googlesource.com/c/109160 > Reviewed-by: Artem Titarenko <artit@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Reviewed-by: Patrik Höglund <phoglund@webrtc.org> > Commit-Queue: Artem Titarenko <artit@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#25582} Bug: webrtc:9955 Change-Id: Ic8a977daa9efb830544da0026c41da5ed2a056f2 Reviewed-on: https://webrtc-review.googlesource.com/c/111753 Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Patrik Höglund <phoglund@google.com> Commit-Queue: Artem Titarenko <artit@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25827}
diff --git a/BUILD.gn b/BUILD.gn index 249094b..a45bea0 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -643,6 +643,11 @@ "//base:base_java_test_support", "//third_party/google-truth:google_truth_java", ] + + additional_jar_files = [ [ + "sdk/android/tests/resources/robolectric.properties", + "robolectric.properties", + ] ] } } }