Fix android_junit_tests and add a GN target for them.

webrtc/BUILD.gn

 # Copyright (c) 2014 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.
 
 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330.
 
 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.
 config("common_inherited_config") {
   defines = []
   cflags = []
   ldflags = []
   if (build_with_mozilla) {
     defines += [ "WEBRTC_MOZILLA_BUILD" ]
   }
@@ skipping 800 matching lines @@
     if (is_mac) {
       sources += [ "base/macsocketserver_unittest.cc" ]
     }
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugin.
       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
   }
 }
+
+if (is_android) {

[kjellander_webrtc, 2016/09/16 11:13:34]

Just put this into
if (rtc_include_tests) {

instead and it will not affect Chrome.

+  junit_binary("android_junit_tests") {
+    java_files = [ "androidjunit/src/org/webrtc/CameraEnumerationTest.java" ]
+
+    deps = [
+      "//webrtc/api:libjingle_peerconnection_java",
+      "//webrtc/api:libjingle_peerconnection_jni",
+    ]
+  }
+}