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}

6 files changed, 19 insertions, 72 deletions

diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py
index 84b130d..b13fdb2 100644
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py
@@ -33,6 +33,9 @@ _DEFAULT_ANNOTATIONS = [
     'EnormousTest', 'IntegrationTest']
 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS = [
     'DisabledTest', 'FlakyTest']
+_EXTRA_ENABLE_HTTP_SERVER = (
+    'org.chromium.chrome.test.ChromeInstrumentationTestRunner.'
+        + 'EnableTestHttpServer')
 _EXTRA_DRIVER_TEST_LIST = (
     'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestList')
 _EXTRA_DRIVER_TEST_LIST_FILE = (
@@ -595,6 +598,12 @@ class InstrumentationTestInstance(test_instance.TestInstance):
           new_tests.append(parameterized_t)
     return tests + new_tests
 
+  @staticmethod
+  def GetHttpServerEnvironmentVars():
+    return {
+      _EXTRA_ENABLE_HTTP_SERVER: None,
+    }
+
   def GetDriverEnvironmentVars(
       self, test_list=None, test_list_file_path=None):
     env = {
diff --git a/build/android/pylib/local/device/local_device_instrumentation_test_run.py b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
index ef78c89..1efe510 100644
--- a/build/android/pylib/local/device/local_device_instrumentation_test_run.py
+++ b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
@@ -137,7 +137,7 @@ class LocalDeviceInstrumentationTestRun(
 
   #override
   def _RunTest(self, device, test):
-    extras = {}
+    extras = self._test_instance.GetHttpServerEnvironmentVars()
 
     flags = None
     test_timeout_scale = None
diff --git a/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py b/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py
index ee018579..8858b06 100644
--- a/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py
+++ b/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py
@@ -40,6 +40,7 @@ class RemoteDeviceInstrumentationTestRun(
 
       env_vars = self._test_instance.GetDriverEnvironmentVars(
           test_list_file_path=test_list_file.name)
+      env_vars.update(self._test_instance.GetHttpServerEnvironmentVars())
 
       logging.debug('extras:')
       for k, v in env_vars.iteritems():
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))
diff --git a/build/get_landmines.py b/build/get_landmines.py
index 9820fec..4139957 100755
--- a/build/get_landmines.py
+++ b/build/get_landmines.py
@@ -36,7 +36,6 @@ def print_landmines():
   if platform() == 'android':
     print 'Clobber: to handle new way of suppressing findbugs failures.'
     print 'Clobber to fix gyp not rename package name (crbug.com/457038)'
-    print 'Clobber to work around incremental dex issue (crbug.com/569713)'
   if platform() == 'win' and builder() == 'ninja':
     print 'Compile on cc_unittests fails due to symbols removed in r185063.'
   if platform() == 'linux' and builder() == 'ninja':
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 9f460db..93913b2 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -85,7 +85,7 @@
     'input_jars_paths': [],
     'library_dexed_jars_paths': [],
     'additional_src_dirs': [],
-    'generated_src_dirs': [ '<(native_libraries_java_dir)' ],
+    'generated_src_dirs': [],
     'app_manifest_version_name%': '<(android_app_version_name)',
     'app_manifest_version_code%': '<(android_app_version_code)',
     # aapt generates this proguard.txt.
@@ -114,7 +114,9 @@
     'package_input_paths': [],
     'ordered_libraries_file': '<(intermediate_dir)/native_libraries.json',
     'additional_ordered_libraries_file': '<(intermediate_dir)/additional_native_libraries.json',
+    'native_libraries_template': '<(DEPTH)/base/android/java/templates/NativeLibraries.template',
     'native_libraries_java_dir': '<(intermediate_dir)/native_libraries_java/',
+    'native_libraries_java_file': '<(native_libraries_java_dir)/NativeLibraries.java',
     'native_libraries_java_stamp': '<(intermediate_dir)/native_libraries_java.stamp',
     'native_libraries_template_data_dir': '<(intermediate_dir)/native_libraries/',
     'native_libraries_template_data_file': '<(native_libraries_template_data_dir)/native_libraries_array.h',
@@ -180,13 +182,6 @@
       'create_abi_split%': '<(create_abi_split)',
       'final_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name).apk',
       'conditions': [
-        ['is_test_apk == 1', {
-          'native_libraries_template': '<(DEPTH)/base/test/android/java/templates/NativeTestLibraries.template',
-          'native_libraries_java_file_name': 'NativeTestLibraries.java',
-        }, {
-          'native_libraries_template': '<(DEPTH)/base/android/java/templates/NativeLibraries.template',
-          'native_libraries_java_file_name': 'NativeLibraries.java',
-        }],
         ['gyp_managed_install == 1 and native_lib_target != ""', {
           'conditions': [
             ['create_abi_split == 0', {
@@ -224,8 +219,6 @@
     },
     'native_lib_target%': '',
     'native_lib_version_name%': '',
-    'native_libraries_template': '<(native_libraries_template)',
-    'native_libraries_java_file': '<(native_libraries_java_dir)/<(native_libraries_java_file_name)',
     'use_chromium_linker%' : 0,
     'load_library_from_zip%' : 0,
     'use_relocation_packer%' : 0,
@@ -324,6 +317,7 @@
             },
           }],
         ],
+        'generated_src_dirs': [ '<(native_libraries_java_dir)' ],
         'native_libs_paths': [
           '<(SHARED_LIB_DIR)/<(native_lib_target).>(android_product_extension)',
           '<@(chromium_linker_path)'
@@ -409,7 +403,7 @@
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/gcc_preprocess.py',
-            '--include-path=<(DEPTH)',
+            '--include-path=',
             '--output=<(native_libraries_java_file)',
             '--template=<(native_libraries_template)',
             '--stamp=<(native_libraries_java_stamp)',
@@ -589,28 +583,6 @@
           },
         }],
       ],
-    }, {
-      'actions': [
-        {
-          'action_name': 'empty_native_libraries_<(_target_name)',
-          'message': 'Creating empty NativeLibraries.java for <(_target_name)',
-          'inputs': [
-            '<(DEPTH)/build/android/gyp/util/build_utils.py',
-            '<(DEPTH)/build/android/gyp/gcc_preprocess.py',
-            '<(native_libraries_template)',
-          ],
-          'outputs': [
-            '<(native_libraries_java_stamp)',
-          ],
-          'action': [
-            'python', '<(DEPTH)/build/android/gyp/gcc_preprocess.py',
-            '--include-path=<(DEPTH)',
-            '--output=<(native_libraries_java_file)',
-            '--template=<(native_libraries_template)',
-            '--stamp=<(native_libraries_java_stamp)',
-          ],
-        },
-      ],
     }], # native_lib_target != ''
     ['gyp_managed_install == 0 or create_standalone_apk == 1 or create_abi_split == 1', {
       'dependencies': [