From bb716daea73889517f996aa29f867563ed63d58a Mon Sep 17 00:00:00 2001
From: sakal <sakal@webrtc.org>
Date: Thu, 15 Sep 2016 12:27:52 -0700
Subject: [PATCH] Fix android_junit_tests and add a GN target for them.

BUG=webrtc:6365
NOTRY=True

Review-Url: https://codereview.webrtc.org/2346793002
Cr-Commit-Position: refs/heads/master@{#14241}
---
 webrtc/BUILD.gn                                   | 15 +++++++++++++++
 .../src/org/webrtc/CameraEnumerationTest.java     |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 88c4e09c72..d61bbd845c 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -12,6 +12,10 @@ import("//build/config/linux/pkg_config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("build/webrtc.gni")
 import("//third_party/protobuf/proto_library.gni")
+if (is_android) {
+  import("//build/config/android/config.gni")
+  import("//build/config/android/rules.gni")
+}
 
 # Contains the defines and includes in common.gypi that are duplicated both as
 # target_defaults and direct_dependent_settings.
@@ -828,3 +832,14 @@ if (rtc_include_tests) {
     }
   }
 }
+
+if (is_android) {
+  junit_binary("android_junit_tests") {
+    java_files = [ "androidjunit/src/org/webrtc/CameraEnumerationTest.java" ]
+
+    deps = [
+      "//webrtc/api:libjingle_peerconnection_java",
+      "//webrtc/api:libjingle_peerconnection_jni",
+    ]
+  }
+}
diff --git a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java b/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
index 031cdfd5c9..5ec2ac4d90 100644
--- a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
+++ b/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
@@ -15,9 +15,9 @@ import static org.webrtc.CameraEnumerationAndroid.getClosestSupportedFramerateRa
 
 import org.webrtc.CameraEnumerationAndroid.CaptureFormat.FramerateRange;
 
+import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import java.util.Arrays;
@@ -25,7 +25,7 @@ import java.util.Arrays;
 /**
  * Tests for CameraEnumerationAndroid.
  */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class CameraEnumerationTest {
   @Test