[Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer.

build/config/android/rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 1329 matching lines @@
     }
 
     _native_lib_version_rule = ""
     if (defined(invoker.native_lib_version_rule)) {
       _native_lib_version_rule = invoker.native_lib_version_rule
     }
     _native_lib_version_arg = "\"\""
     if (defined(invoker.native_lib_version_arg)) {
       _native_lib_version_arg = invoker.native_lib_version_arg
     }
+
+    _native_libraries_template =
+        "//base/android/java/templates/NativeLibraries.template"
+    if (defined(invoker.native_libraries_template)) {
+      _native_libraries_template = invoker.native_libraries_template
+    }
+
+    _native_libraries_package_name = "org/chromium/base/library_loader"
+    if (defined(invoker.native_libraries_package_name)) {
+      _native_libraries_package_name = invoker.native_libraries_package_name
+    }
   }
 
   _android_manifest_deps = []
   if (defined(invoker.android_manifest_dep)) {
     _android_manifest_deps = [ invoker.android_manifest_dep ]
   }
   _android_manifest = invoker.android_manifest
 
   _rebased_build_config = rebase_path(_build_config, root_build_dir)
   _create_abi_split =
@@ skipping 65 matching lines @@
   }
   _srcjar_deps += [ ":$process_resources_target" ]
 
   if (_native_libs != []) {
     _enable_chromium_linker_tests = false
     if (defined(invoker.enable_chromium_linker_tests)) {
       _enable_chromium_linker_tests = invoker.enable_chromium_linker_tests
     }
 
     java_cpp_template("${_template_name}__native_libraries_java") {
-      package_name = "org/chromium/base/library_loader"
+      package_name = _native_libraries_package_name
       sources = [
-        "//base/android/java/templates/NativeLibraries.template",
+        _native_libraries_template,
       ]
       inputs = [
         _build_config,
       ]
       deps = [
         ":$build_config_target",
       ]
       if (_native_lib_version_rule != "") {
         deps += [ _native_lib_version_rule ]
       }
@@ skipping 414 matching lines @@
     forward_variables_from(invoker, [ "isolate_file" ])
     test_name = invoker.target_name
     test_type = "instrumentation"
     apk_target = ":$_apk_target_name"
   }
 
   android_apk(_apk_target_name) {
     deps = []
     data_deps = []
     forward_variables_from(invoker, "*")
-    deps += [ "//testing/android/broker:broker_java" ]
+    deps += [
+      "//base:base_java",

[agrieve, 2015/11/24 16:27:14]

Shouldn't be necessary?

[jbudorick, 2015/11/24 18:19:28]

nope, removed

+      "//testing/android/broker:broker_java",
+    ]
     data_deps += [
       "//testing/android/driver:driver_apk",
       "//tools/android/forwarder2",
       "//tools/android/md5sum",
     ]
+
     run_findbugs = false
   }
 
   group(target_name) {
     public_deps = [
       ":$_apk_target_name",
       ":$_test_runner_target_name",
     ]
   }
 }
@@ skipping 312 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }