Revert of Fix sandbox_linux_unittests_deps on GN & Android (patchset #3 id:80001 of https://codereview.chromium.org/1415533008/ )

Reason for revert:
breaks content_unittests (and presumably other suites that depend on device_forwarder), e.g. http://build.chromium.org/p/chromium.linux/builders/Android%20GN/builds/31756

Original issue's description:
> Fix sandbox_linux_unittests_deps on GN & Android
>
> BUG=510485
>
> Committed: https://crrev.com/34b5bbdceab40058ab331e62b6e619175706d4fc
> Cr-Commit-Position: refs/heads/master@{#356312}

TBR=dpranke@chromium.org,jln@chromium.org,pkotwicz@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=510485

Review URL: https://codereview.chromium.org/1424903002

Cr-Commit-Position: refs/heads/master@{#356432}

1 files changed, 20 insertions, 31 deletions

diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
index 112f19f..f92db8f 100644
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -6,10 +6,6 @@ import("//build/config/features.gni")
 import("//build/config/nacl/config.gni")
 import("//testing/test.gni")
 
-if (is_android) {
-  import("//build/config/android/rules.gni")
-}
-
 declare_args() {
   compile_suid_client = is_linux
 
@@ -201,14 +197,10 @@ group("sandbox_linux_unittests_run") {
   ]
 }
 
-# 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
+# The main sandboxing test target.
+test("sandbox_linux_unittests") {
   deps = [
     ":sandbox_linux_unittests_sources",
-    "//build/config/sanitizers:deps",
   ]
 }
 
@@ -453,27 +445,24 @@ if (compile_suid_client || is_nacl_nonsfi) {
 }
 
 if (is_android) {
-  create_native_executable_dist("sandbox_linux_unittests_deps") {
-    testonly = true
-    dist_dir = "$root_out_dir/sandbox_linux_unittests_deps"
-    binary = "$root_out_dir/sandbox_linux_unittests"
-    include_main_binary = false
-    deps = [
-      ":sandbox_linux_unittests",
-    ]
-
-    if (is_component_build) {
-      deps += [ "//build/android:cpplib_stripped" ]
-    }
-  }
-
-  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.isolate"
-  }
-
+  # TODO(GYP) enable this. Needs an android_strip wrapper python script.
+  #action("sandbox_linux_unittests_stripped") {
+  #  script = "android_stip.py"
+  #
+  #  in_file = "$root_out_dir/sandbox_linux_unittests"
+  #
+  #  out_file = "$root_out_dir/sandbox_linux_unittests_stripped"
+  #  outputs = [ out_file ]
+  #
+  #  args = [
+  #    rebase_path(in_file, root_build_dir),
+  #    "-o", rebase_path(out_file, root_build_dir),
+  #  ]
+  #
+  #  deps = [
+  #    ":sandbox_linux_unittests",
+  #  ]
+  #}
   # TODO(GYP) convert this.
   #      {
   #      'target_name': 'sandbox_linux_jni_unittests_apk',