Reland "Rename wrapper_scripts for generated_script tests in MB."

This reverts commit 56428611.

Reason for revert: Relanding now that the internal failure has been fixed.

Original change's description:
> Revert "Rename wrapper_scripts for generated_script tests in MB."
>
> This reverts commit 8700df8a.
>
> Reason for revert:
>
> Android builders started failing since this commit:
> https://ci.chromium.org/p/chrome/builders/ci/android-builder-perf/217957
>
> Traceback (most recent call last):
>   File "/b/s/w/ir/cache/builder/src/tools/mb/mb.py", line 105, in Main
>     ret = self.args.func()
>   File "/b/s/w/ir/cache/builder/src/tools/mb/mb.py", line 378, in CmdGen
>     return self.RunGNGen(vals)
>   File "/b/s/w/ir/cache/builder/src/tools/mb/mb.py", line 961, in RunGNGen
>     ret = self.GenerateIsolates(vals, isolate_targets, isolate_map, build_dir)
>   File "/b/s/w/ir/cache/builder/src/tools/mb/mb.py", line 1075, in GenerateIsolates
>     command, extra_files = self.GetIsolateCommand(target, vals)
>   File "/b/s/w/ir/cache/builder/src/tools/mb/mb.py", line 1392, in GetIsolateCommand
>     'generated_scripts can no longer customize the script path')
> AssertionError: generated_scripts can no longer customize the script path
>
>
> Original change's description:
> > Rename wrapper_scripts for generated_script tests in MB.
> >
> > A few tests (some Android resource_sizes tests, and one Perfetto
> > test), were using generated_script tests that were generating
> > wrappers that weren't named 'bin/run_$target_name'.
> >
> > We want all generated_script tests to be using consistent names, so
> > this CL changes those targets.
> >
> > Bug: 816629
> > Change-Id: If447fbee6b33637de4c9711e87379128272285af
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380672
> > Commit-Queue: Dirk Pranke <dpranke@google.com>
> > Reviewed-by: John Chen <johnchen@chromium.org>
> > Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#802694}
>
> TBR=dpranke@google.com,agrieve@chromium.org,johnchen@chromium.org
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 816629
> Change-Id: I11ec06405105860f01f3b7752df2024615f7badc
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2384069
> Reviewed-by: Wenbin Zhang <wenbinzhang@google.com>
> Commit-Queue: John Chen <johnchen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#802984}

TBR=dpranke@google.com,agrieve@chromium.org,johnchen@chromium.org,wenbinzhang@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.


Bug: 816629
Change-Id: I44017e48dc94a1af692a66e00bbd3a127b32b382
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2405793
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#806298}

build/android/resource_sizes.gni

@@ -19,7 +19,7 @@ template("android_resource_sizes_test") {
   generate_android_wrapper(target_name) {
     forward_variables_from(invoker, [ "data_deps" ])
     executable = "//build/android/resource_sizes.py"
-    wrapper_script = "$root_out_dir/bin/${target_name}"
+    wrapper_script = "$root_out_dir/bin/run_${target_name}"
 
     assert(defined(invoker.apk_name) != defined(invoker.file_path),
            "Exactly one of apk_name or file_path should be provided.")

testing/buildbot/gn_isolate_map.pyl

@@ -46,11 +46,9 @@
 #  : the test is a python script; the path to the script is specified in
 #    the "script" field.
 #  "generated_script"
-#  : the test is a script generated at build time; the script *should* be
+#  : the test is a script generated at build time; the script *must* be
 #    in output_dir/bin/run_$target (or output_dir\bin\run_$target.bat on
-#    Windows), but an alternative path *may* be specified,
-#    in the "script" field, as *relative to the output directory*.
-#    TODO(crbug.com/816629): remove support for "script".
+#    Windows).
 #  "unknown"
 #  : (the default), which indicates that we don't know what the command line
 #    needs to be (this is a fatal error).
@@ -1435,12 +1433,10 @@
   "resource_sizes_chrome_modern_public_minimal_apks": {
     "label": "//chrome/android:resource_sizes_chrome_modern_public_minimal_apks",
     "type": "generated_script",
-    "script": "bin/resource_sizes_chrome_modern_public_minimal_apks",
   },
   "resource_sizes_cronet_sample_apk": {
     "label": "//components/cronet/android:resource_sizes_cronet_sample_apk",
     "type": "generated_script",
-    "script": "bin/resource_sizes_cronet_sample_apk",
   },
   'resource_sizes_lacros_chrome': {
     "label": "//chromeos/lacros:resource_sizes_lacros_chrome",
@@ -1450,17 +1446,14 @@
   "resource_sizes_monochrome_public_minimal_apks": {
     "label": "//chrome/android:resource_sizes_monochrome_public_minimal_apks",
     "type": "generated_script",
-    "script": "bin/resource_sizes_monochrome_public_minimal_apks",
   },
   "resource_sizes_trichrome": {
     "label": "//chrome/android:resource_sizes_trichrome",
     "type": "generated_script",
-    "script": "bin/resource_sizes_trichrome",
   },
   "resource_sizes_system_webview_bundle": {
     "label": "//android_webview:resource_sizes_system_webview_bundle",
     "type": "generated_script",
-    "script": "bin/resource_sizes_system_webview_bundle",
   },
   "sandbox_linux_unittests": {
     "label": "//sandbox/linux:sandbox_linux_unittests",
@@ -1701,7 +1694,6 @@
   "upload_trace_processor": {
     "label": "//tools/perf/core/perfetto_binary_roller:upload_trace_processor",
     "type": "generated_script",
-    "script": "bin/upload_trace_processor",
   },
   "url_unittests": {
     "label": "//url:url_unittests",

tools/mb/mb.py

@@ -1392,6 +1392,8 @@ class MetaBuildWrapper(object):
       cmdline = []
 
     if test_type == 'generated_script' or is_ios or is_lacros:
+      assert 'script' not in isolate_map[target], (
+          'generated_scripts can no longer customize the script path')
       if is_win:
         default_script = 'bin\\run_{}.bat'.format(target)
       else:

tools/perf/core/perfetto_binary_roller/BUILD.gn

@@ -22,7 +22,7 @@ generate_wrapper("upload_trace_processor") {
   }
 
   executable = "upload_trace_processor.py"
-  wrapper_script = "$root_build_dir/bin/upload_trace_processor"
+  wrapper_script = "$root_build_dir/bin/run_upload_trace_processor"
   executable_args = [
     "--path",
     "@WrappedPath(./$binary_name)",