Revert of 🍬 GN: Make breakpad_unittests & sandbox_linux_unittests use test()

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/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
@@ skipping 2225 matching lines @@
 #   binary: Path to (stripped) executable.
 #   include_main_binary: Whether |binary| should be copied to |dist_dir|.
 #
 # Example
 #   create_native_executable_dist("foo_dist") {
 #     dist_dir = "$root_build_dir/foo_dist"
 #     binary = "$root_build_dir/foo"
 #     deps = [ ":the_thing_that_makes_foo" ]
 #   }
 template("create_native_executable_dist") {
+  set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
 
-  _libraries_list = "${target_gen_dir}/${target_name}_library_dependencies.list"
+  dist_dir = invoker.dist_dir
+  binary = invoker.binary
+  template_name = target_name
 
-  _find_deps_target_name = "${target_name}__find_library_dependencies"
+  libraries_list =
+      "${target_gen_dir}/${template_name}_library_dependencies.list"
 
-  # TODO(agrieve): Extract dependent libs from GN rather than readelf.
-  action(_find_deps_target_name) {
+  find_deps_target_name = "${template_name}__find_library_dependencies"
+  copy_target_name = "${template_name}__copy_libraries_and_exe"
+
+  action(find_deps_target_name) {
     forward_variables_from(invoker, [ "deps" ])
+    visibility = [ ":$copy_target_name" ]
 
     script = "//build/android/gyp/write_ordered_libraries.py"
     depfile = "$target_gen_dir/$target_name.d"
     inputs = [
-      invoker.binary,
+      binary,
       android_readelf,
     ]
     outputs = [
       depfile,
-      _libraries_list,
+      libraries_list,
     ]
-    rebased_binaries = rebase_path([ invoker.binary ], root_build_dir)
+    rebased_binaries = rebase_path([ binary ], root_build_dir)
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--input-libraries=$rebased_binaries",
       "--libraries-dir",
       rebase_path(root_shlib_dir, root_build_dir),
       "--output",
-      rebase_path(_libraries_list, root_build_dir),
+      rebase_path(libraries_list, root_build_dir),
       "--readelf",
       rebase_path(android_readelf, root_build_dir),
     ]
   }
 
-  copy_ex(target_name) {
+  copy_ex(copy_target_name) {
+    visibility = [ ":$template_name" ]
+
     clear_dir = true
 
     inputs = [
-      _libraries_list,
+      libraries_list,
     ]
     if (defined(invoker.include_main_binary) && invoker.include_main_binary) {
-      inputs += [ invoker.binary ]
+      inputs += [ binary ]
     }
 
-    dest = invoker.dist_dir
+    dest = dist_dir
 
-    rebased_libraries_list = rebase_path(_libraries_list, root_build_dir)
+    rebased_libraries_list = rebase_path(libraries_list, root_build_dir)
     args = [ "--files=@FileArg($rebased_libraries_list:lib_paths)" ]
     if (defined(invoker.include_main_binary) && invoker.include_main_binary) {
-      rebased_binaries_list = rebase_path([ invoker.binary ], root_build_dir)
+      rebased_binaries_list = rebase_path([ binary ], root_build_dir)
       args += [ "--files=$rebased_binaries_list" ]
     }
 
     deps = [
-      ":$_find_deps_target_name",
+      ":$find_deps_target_name",
     ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
   }
+
+  group(template_name) {
+    forward_variables_from(invoker, [ "visibility" ])
+    public_deps = [
+      ":$copy_target_name",
+    ]
+  }
 }
 
 # Compile a protocol buffer to java.
 #
 # This generates java files from protocol buffers and creates an Android library
 # containing the classes.
 #
 # Variables
 #   sources: Paths to .proto files to compile.
 #   proto_path: Root directory of .proto files.
@@ skipping 85 matching lines @@
       "--target",
       rebase_path(invoker.target, root_build_dir),
       "--output-directory",
       rebase_path(root_out_dir, root_build_dir),
     ]
     if (defined(invoker.flag_name)) {
       args += [ "--flag-name=${invoker.flag_name}" ]
     }
   }
 }