Put generated non-test Java runner scripts into bin/

build/config/android/internal_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("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
@@ skipping 176 matching lines @@
 #   wrapper_script_args: List of extra arguments to pass to the executable.
 #
 template("java_binary_script") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
 
   _main_class = invoker.main_class
   _build_config = invoker.build_config
   _jar_path = invoker.jar_path
   _script_name = invoker.script_name
+  _used_only_by_tests =
+      defined(invoker.used_only_by_tests) && invoker.used_only_by_tests
 
   action(target_name) {
     script = "//build/android/gyp/create_java_binary_script.py"
     depfile = "$target_gen_dir/$_script_name.d"
-    java_script = "$root_build_dir/bin/helper/$_script_name"
+    java_script = "$root_build_dir/bin/$_script_name"
+    if (_used_only_by_tests) {
+      java_script = "$root_build_dir/bin/helper/$_script_name"
+    }
     inputs = [
       _build_config,
     ]
     outputs = [
       depfile,
       java_script,
     ]
     forward_variables_from(invoker, [ "deps" ])
     _rebased_build_config = rebase_path(_build_config, root_build_dir)
     args = [
@@ skipping 1079 matching lines @@
     }
   }
 
   if (defined(invoker.main_class)) {
     _binary_script_target_name = "${_template_name}__java_binary_script"
     java_binary_script(_binary_script_target_name) {
       forward_variables_from(invoker,
                              [
                                "bootclasspath",
                                "main_class",
+                               "used_only_by_tests",
                                "wrapper_script_args",
                              ])
       build_config = _build_config
       jar_path = _jar_path
       script_name = _template_name
       if (defined(invoker.wrapper_script_name)) {
         script_name = invoker.wrapper_script_name
       }
       deps = [
         ":$_build_config_target_name",
@@ skipping 380 matching lines @@
     deps = build_config_deps
   }
 
   if (defined(invoker.main_class)) {
     _final_datadeps += [ ":${_template_name}__java_binary_script" ]
     java_binary_script("${_template_name}__java_binary_script") {
       forward_variables_from(invoker,
                              [
                                "bootclasspath",
                                "main_class",
+                               "used_only_by_tests",
                                "wrapper_script_args",
                              ])
       build_config = _build_config
       jar_path = _jar_path
       script_name = _template_name
       if (defined(invoker.wrapper_script_name)) {
         script_name = invoker.wrapper_script_name
       }
       deps = build_config_deps
     }
@@ skipping 448 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }