From ff088a1702b24b5145ccbb3911da94c7c829b940 Mon Sep 17 00:00:00 2001
From: Artem Titarenko <artit@webrtc.org>
Date: Wed, 28 Nov 2018 14:46:40 +0100
Subject: [PATCH] Reland "Run robolectric tests for Android on several Android
 API versions"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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}
---
 BUILD.gn                                           | 5 +++++
 sdk/android/tests/resources/robolectric.properties | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 sdk/android/tests/resources/robolectric.properties

diff --git a/BUILD.gn b/BUILD.gn
index 249094bdd6..a45bea091f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -643,6 +643,11 @@ if (rtc_include_tests) {
         "//base:base_java_test_support",
         "//third_party/google-truth:google_truth_java",
       ]
+
+      additional_jar_files = [ [
+            "sdk/android/tests/resources/robolectric.properties",
+            "robolectric.properties",
+          ] ]
     }
   }
 }
diff --git a/sdk/android/tests/resources/robolectric.properties b/sdk/android/tests/resources/robolectric.properties
new file mode 100644
index 0000000000..ec3afb73e5
--- /dev/null
+++ b/sdk/android/tests/resources/robolectric.properties
@@ -0,0 +1 @@
+sdk=16,18,21,25,26