Revert of [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (patchset #13 id:240001 of https://codereview.chromium.org/1465383003/ )

Reason for revert:
Android compile failing with related error: https://code.google.com/p/chromium/issues/detail?id=569991

Original issue's description:
> [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer.
>
> BUG=488195
>
> Committed: https://crrev.com/06215e9286247b08ff6c958f725c6e5185c4acd1
> Cr-Commit-Position: refs/heads/master@{#365254}

TBR=tedchoc@chromium.org,yfriedman@chromium.org,agrieve@chromium.org,mef@chromium.org,thakis@chromium.org,jbudorick@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=488195

Review URL: https://codereview.chromium.org/1526183002

Cr-Commit-Position: refs/heads/master@{#365309}

1 files changed, 3 insertions, 37 deletions

diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 5af8ee2..aeb7f1e 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1351,17 +1351,6 @@ template("android_apk") {
     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 = []
@@ -1447,9 +1436,9 @@ template("android_apk") {
     }
 
     java_cpp_template("${_template_name}__native_libraries_java") {
-      package_name = _native_libraries_package_name
+      package_name = "org/chromium/base/library_loader"
       sources = [
-        _native_libraries_template,
+        "//base/android/java/templates/NativeLibraries.template",
       ]
       inputs = [
         _build_config,
@@ -1477,22 +1466,6 @@ template("android_apk") {
       }
     }
     _srcjar_deps += [ ":${_template_name}__native_libraries_java" ]
-  } else if (defined(invoker.native_libraries_template) &&
-             invoker.native_libraries_template != "") {
-    java_cpp_template("${_template_name}__empty_native_libraries_java") {
-      assert(defined(invoker.native_libraries_package_name))
-      package_name = invoker.native_libraries_package_name
-      sources = [
-        invoker.native_libraries_template,
-      ]
-      inputs = [
-        _build_config,
-      ]
-      deps = [
-        ":$build_config_target",
-      ]
-    }
-    _srcjar_deps += [ ":${_template_name}__empty_native_libraries_java" ]
   }
 
   java_target = "${_template_name}__java"
@@ -1937,20 +1910,13 @@ template("instrumentation_test_apk") {
     deps = []
     data_deps = []
     forward_variables_from(invoker, "*")
-    deps += [
-      "//base:base_java",
-      "//testing/android/broker:broker_java",
-    ]
+    deps += [ "//testing/android/broker:broker_java" ]
     data_deps += [
       "//testing/android/driver:driver_apk",
       "//tools/android/forwarder2",
       "//tools/android/md5sum",
     ]
 
-    native_libraries_template =
-        "//base/test/android/java/templates/NativeTestLibraries.template"
-    native_libraries_package_name = "org.chromium.base.test.library_loader"
-
     run_findbugs =
         defined(invoker.run_findbugs) && invoker.run_findbugs &&
         (defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir))