From 8d5bc578e5107d2b0b3b9ea9f7e0642dc434e9f6 Mon Sep 17 00:00:00 2001
From: Oleh Prypin <oprypin@google.com>
Date: Tue, 21 Aug 2018 06:56:30 +0000
Subject: [PATCH] Revert "Default runner to junit4"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 902093493b608a1172248b85510bea291419c6ca.

Reason for revert: Breaks downstream project

Original change's description:
> Default runner to junit4
>
> Bug: chromium:868610
> Change-Id: Ifc457d8e74cf42e9ba4d21807721f86c521b35e9
> Reviewed-on: https://webrtc-review.googlesource.com/94440
> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
> Commit-Queue: Andrew Luo <aluo@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#24350}

TBR=phoglund@webrtc.org,sakal@webrtc.org,jbudorick@chromium.org,aluo@chromium.org

Change-Id: Ie972a2500bc15ff95d8c61a0ace681387b657ae7
No-Try: true
Bug: chromium:868610
Reviewed-on: https://webrtc-review.googlesource.com/95060
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@google.com>
Cr-Commit-Position: refs/heads/master@{#24354}
---
 examples/androidtests/AndroidManifest.xml            | 5 ++++-
 sdk/android/instrumentationtests/AndroidManifest.xml | 5 ++++-
 test/android/AndroidManifest.xml                     | 3 +--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/examples/androidtests/AndroidManifest.xml b/examples/androidtests/AndroidManifest.xml
index 7cd52bc531..7ce02dc415 100644
--- a/examples/androidtests/AndroidManifest.xml
+++ b/examples/androidtests/AndroidManifest.xml
@@ -20,8 +20,11 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
+    <!-- tools:ignore needed for chromium-junit4 tag. crbug.com/640116
+         TODO(sakal): Remove once the tag is no longer needed. -->
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
         tools:ignore="MissingPrefix"
         android:targetPackage="org.appspot.apprtc"
-        android:label="Tests for AppRTCMobile"/>
+        android:label="Tests for AppRTCMobile"
+        chromium-junit4="true"/>
 </manifest>
diff --git a/sdk/android/instrumentationtests/AndroidManifest.xml b/sdk/android/instrumentationtests/AndroidManifest.xml
index 75df968f13..591932c38e 100644
--- a/sdk/android/instrumentationtests/AndroidManifest.xml
+++ b/sdk/android/instrumentationtests/AndroidManifest.xml
@@ -31,8 +31,11 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
+    <!-- tools:ignore needed for chromium-junit4 tag. crbug.com/640116
+         TODO(sakal): Remove once the tag is no longer needed. -->
     <instrumentation android:name="org.chromium.base.test.BaseChromiumAndroidJUnitRunner"
         tools:ignore="MissingPrefix"
         android:targetPackage="org.webrtc"
-        android:label="Tests for WebRTC Android SDK"/>
+        android:label="Tests for WebRTC Android SDK"
+        chromium-junit4="true"/>
 </manifest>
diff --git a/test/android/AndroidManifest.xml b/test/android/AndroidManifest.xml
index c1ddfd4a02..f8eb2e500c 100644
--- a/test/android/AndroidManifest.xml
+++ b/test/android/AndroidManifest.xml
@@ -41,7 +41,6 @@ be found in the AUTHORS file in the root of the source tree.
 
     <instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner"
             android:targetPackage="org.webrtc.native_test"
-            android:label="Instrumentation entry point for org.webrtc.native_test"
-            chromium-junit3="true"/>
+            android:label="Instrumentation entry point for org.webrtc.native_test"/>
 
 </manifest>