From b99b5960e114933b1f0aef5c9b73cb85ba2aa876 Mon Sep 17 00:00:00 2001
From: sakal <sakal@webrtc.org>
Date: Tue, 7 Feb 2017 04:12:30 -0800
Subject: [PATCH] Add chromium-junit4 tag to instrumentation test
 AndroidManifests.

This tag is supposed to be temporary and removed when all Chromium tests
have been migrated to JUnit4.

BUG=webrtc:7123,chromium:640116
NOTRY=True

Review-Url: https://codereview.webrtc.org/2683583002
Cr-Commit-Position: refs/heads/master@{#16465}
---
 webrtc/examples/androidtests/AndroidManifest.xml            | 6 +++++-
 webrtc/sdk/android/instrumentationtests/AndroidManifest.xml | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/webrtc/examples/androidtests/AndroidManifest.xml b/webrtc/examples/androidtests/AndroidManifest.xml
index 3df2c693e0..d5de7fc134 100644
--- a/webrtc/examples/androidtests/AndroidManifest.xml
+++ b/webrtc/examples/androidtests/AndroidManifest.xml
@@ -21,7 +21,11 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
+    <!-- Needed for chromium-junit4 tag. crbug.com/640116
+         TODO(sakal): Remove once the tag is no longer needed. -->
+    <!--suppress MissingPrefix -->
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
         android:targetPackage="org.appspot.apprtc"
-        android:label="Tests for AppRTCMobile"/>
+        android:label="Tests for AppRTCMobile"
+        chromium-junit4="true"/>
 </manifest>
diff --git a/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml b/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
index 15c9e6779e..c83fea8c54 100644
--- a/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
+++ b/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
@@ -30,7 +30,11 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
+    <!-- Needed for chromium-junit4 tag. crbug.com/640116
+         TODO(sakal): Remove once the tag is no longer needed. -->
+    <!--suppress MissingPrefix -->
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
         android:targetPackage="org.webrtc"
-        android:label="Tests for WebRTC Android SDK"/>
+        android:label="Tests for WebRTC Android SDK"
+        chromium-junit4="true"/>
 </manifest>