Move webrtc/api/androidtests to webrtc/sdk/android/instrumentationtests

BUG=webrtc:5882
NOPRESUBMIT=True

Review-Url: https://codereview.webrtc.org/2541823002
Cr-Commit-Position: refs/heads/master@{#15352}

webrtc/BUILD.gn

@@ -309,7 +309,7 @@ if (!build_with_chromium) {
       if (is_android) {
         deps += [
           ":android_junit_tests",
-          "api:libjingle_peerconnection_android_unittest",
+          "//webrtc/sdk/android/instrumentationtests",
         ]
       } else {
         deps += [ "modules/video_capture:video_capture_tests" ]

webrtc/api/BUILD.gn

@@ -505,36 +505,4 @@ if (rtc_include_tests) {
       "//testing/gmock",
     ]
   }
-
-  if (is_android) {
-    instrumentation_test_apk("libjingle_peerconnection_android_unittest") {
-      apk_name = "libjingle_peerconnection_android_unittest"
-      android_manifest = "androidtests/AndroidManifest.xml"
-
-      java_files = [
-        "androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java",
-        "androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java",
-        "androidtests/src/org/webrtc/Camera2CapturerTest.java",
-        "androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java",
-        "androidtests/src/org/webrtc/EglRendererTest.java",
-        "androidtests/src/org/webrtc/GlRectDrawerTest.java",
-        "androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java",
-        "androidtests/src/org/webrtc/NetworkMonitorTest.java",
-        "androidtests/src/org/webrtc/PeerConnectionTest.java",
-        "androidtests/src/org/webrtc/RendererCommonTest.java",
-        "androidtests/src/org/webrtc/SurfaceTextureHelperTest.java",
-        "androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java",
-        "androidtests/src/org/webrtc/WebRtcJniBootTest.java",
-      ]
-
-      deps = [
-        ":libjingle_peerconnection_java",
-        ":libjingle_peerconnection_metrics_default_java",
-        "../base:base_java",
-        "//base:base_java",
-      ]
-
-      shared_libraries = [ ":libjingle_peerconnection_so" ]
-    }
-  }
 }

webrtc/api/androidtests/OWNERS

@@ -1 +0,0 @@
-magjed@webrtc.org

webrtc/build/gn_isolate_map.pyl

@@ -40,7 +40,7 @@
     "type": "console_test_launcher",
   },
   "libjingle_peerconnection_android_unittest": {
-    "label": "//webrtc/api:libjingle_peerconnection_android_unittest",
+    "label": "//webrtc/sdk/android/instrumentationtests:libjingle_peerconnection_android_unittest",
     "type": "additional_compile_target",
   },
   "modules_tests": {

webrtc/sdk/android/instrumentationtests/BUILD.gn

@@ -0,0 +1,51 @@
+# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("//build/config/android/config.gni")
+import("//build/config/android/rules.gni")
+import("//webrtc/build/webrtc.gni")
+
+group("instrumentationtests") {
+  # This target shall build all targets in instrumentationtests.
+  testonly = true
+  public_deps = []
+
+  public_deps += [ ":libjingle_peerconnection_android_unittest" ]
+}
+
+if (rtc_include_tests) {
+  instrumentation_test_apk("libjingle_peerconnection_android_unittest") {
+    apk_name = "libjingle_peerconnection_android_unittest"
+    android_manifest = "AndroidManifest.xml"
+
+    java_files = [
+      "src/org/webrtc/Camera1CapturerUsingByteBufferTest.java",
+      "src/org/webrtc/Camera1CapturerUsingTextureTest.java",
+      "src/org/webrtc/Camera2CapturerTest.java",
+      "src/org/webrtc/CameraVideoCapturerTestFixtures.java",
+      "src/org/webrtc/EglRendererTest.java",
+      "src/org/webrtc/GlRectDrawerTest.java",
+      "src/org/webrtc/MediaCodecVideoEncoderTest.java",
+      "src/org/webrtc/NetworkMonitorTest.java",
+      "src/org/webrtc/PeerConnectionTest.java",
+      "src/org/webrtc/RendererCommonTest.java",
+      "src/org/webrtc/SurfaceTextureHelperTest.java",
+      "src/org/webrtc/SurfaceViewRendererOnMeasureTest.java",
+      "src/org/webrtc/WebRtcJniBootTest.java",
+    ]
+
+    deps = [
+      "../../../api:libjingle_peerconnection_java",
+      "../../../api:libjingle_peerconnection_metrics_default_java",
+      "../../../base:base_java",
+      "//base:base_java",
+    ]
+
+    shared_libraries = [ "../../../api:libjingle_peerconnection_so" ]
+  }
+}