Move gn _run target generation into test(). (RELAND)

sandbox/linux/BUILD.gn

 # 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/features.gni")
 import("//build/config/nacl/config.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
@@ skipping 174 matching lines @@
     "bpf_dsl/golden/x86-64/NegativeConstantsPolicy.txt",
     "bpf_dsl/golden/x86-64/SwitchPolicy.txt",
   ]
   outputs = [
     "$target_gen_dir/bpf_dsl/golden/golden_files.h",
   ]
   args =
       rebase_path(outputs, root_build_dir) + rebase_path(inputs, root_build_dir)
 }
 
-# TODO(GYP): Delete this after we've converted everything to GN.
+# TODO(GYP): Delete these after we've converted everything to GN.
 # The _run targets exist only for compatibility w/ GYP.
 group("sandbox_linux_unittests_run") {
   testonly = true
   deps = [
     ":sandbox_linux_unittests",
   ]
 }
 
+if (is_android) {
+  group("sandbox_linux_unittests_apk_run") {
+    testonly = true
+    deps = [
+      ":sandbox_linux_unittests",
+    ]
+  }
+}
+
 # The main sandboxing test target. "sandbox_linux_unittests" cannot use the
 # test() template because the test is run as an executable not as an APK on
 # Android.
 executable("sandbox_linux_unittests") {
   testonly = true
   deps = [
     ":sandbox_linux_unittests_sources",
     "//build/config/sanitizers:deps",
   ]
 }
@@ skipping 241 matching lines @@
     }
   }
 
   test_runner_script("sandbox_linux_unittests__test_runner_script") {
     test_name = "sandbox_linux_unittests"
     test_type = "gtest"
     test_suite = "sandbox_linux_unittests"
     isolate_file = "//sandbox/sandbox_linux_unittests_android.isolate"
   }
 }