From 5ae3a028c862bd97a7b52c3d798f5f06a4f65214 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Mon, 12 Nov 2018 11:29:27 +0000 Subject: [PATCH] Revert "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 reverts commit e598e6bff9528f77dc9f4fb3a5954ec5fb6790b0. Reason for revert: Main suspect of increased Android tests flakiness 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 > Reviewed-by: Sami Kalliomäki > Reviewed-by: Patrik Höglund > Commit-Queue: Artem Titarenko > Cr-Commit-Position: refs/heads/master@{#25582} TBR=phoglund@webrtc.org,magjed@webrtc.org,sakal@webrtc.org,artit@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9955 Change-Id: I62c4c9c3238f777b6017701bc1332d8661308f9c Reviewed-on: https://webrtc-review.googlesource.com/c/110609 Reviewed-by: Danil Chapovalov Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#25595} --- BUILD.gn | 5 ----- sdk/android/tests/resources/robolectric.properties | 1 - 2 files changed, 6 deletions(-) delete mode 100644 sdk/android/tests/resources/robolectric.properties diff --git a/BUILD.gn b/BUILD.gn index b2a7cfb4aa..c67602cb57 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -646,11 +646,6 @@ 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 deleted file mode 100644 index f733f3d409..0000000000 --- a/sdk/android/tests/resources/robolectric.properties +++ /dev/null @@ -1 +0,0 @@ -sdk=18,21,25,26 \ No newline at end of file