Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

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("//testing/test.gni")
 
 declare_args() {
   compile_suid_client = is_linux
 
   compile_credentials = is_linux
 
   compile_seccomp_bpf_demo =
-      is_linux && (current_cpu == "x86" || current_cpu == "x64")
+      is_linux && (cpu_arch == "x86" || cpu_arch == "x64")
 }
 
 # We have two principal targets: sandbox and sandbox_linux_unittests
 # All other targets are listed as dependencies.
 # There is one notable exception: for historical reasons, chrome_sandbox is
 # the setuid sandbox and is its own target.
 
 group("sandbox") {
   deps = [
     ":sandbox_services",
@@ skipping 31 matching lines @@
     sources += [
       "seccomp-bpf/bpf_tester_compatibility_delegate.h",
       "seccomp-bpf/bpf_tests.h",
       "seccomp-bpf/sandbox_bpf_test_runner.cc",
       "seccomp-bpf/sandbox_bpf_test_runner.h",
     ]
     deps += [ ":seccomp_bpf" ]
   }
 }
 
-# Sources shared by sandbox_linux_unittests and sandbox_linux_jni_unittests.
-source_set("sandbox_linux_unittests_sources") {
-  testonly = true
-
+# The main sandboxing test target.
+test("sandbox_linux_unittests") {
   sources = [
     "services/proc_util_unittest.cc",
     "services/resource_limits_unittests.cc",
     "services/scoped_process_unittest.cc",
     "services/syscall_wrappers_unittest.cc",
     "services/thread_helpers_unittests.cc",
     "services/yama_unittests.cc",
     "syscall_broker/broker_file_permission_unittest.cc",
     "syscall_broker/broker_process_unittest.cc",
     "tests/main.cc",
@@ skipping 42 matching lines @@
   if (compile_credentials) {
     sources += [
       "integration_tests/namespace_unix_domain_socket_unittest.cc",
       "services/credentials_unittest.cc",
       "services/namespace_sandbox_unittest.cc",
       "services/namespace_utils_unittest.cc",
     ]
   }
 }
 
-# The main sandboxing test target.
-test("sandbox_linux_unittests") {
-  deps = [
-    ":sandbox_linux_unittests_sources",
-  ]
-}
-
-# This target is the shared library used by Android APK (i.e.
-# JNI-friendly) tests.
-shared_library("sandbox_linux_jni_unittests") {
-  testonly = true
-  deps = [
-    ":sandbox_linux_unittests_sources",
-  ]
-  if (is_android) {
-    deps += [ "//testing/android:native_test_native_code" ]
-  }
-}
+# TODO(GYP) Android version of this test.
+#    {
+#      # This target is the shared library used by Android APK (i.e.
+#      # JNI-friendly) tests.
+#      "target_name": "sandbox_linux_jni_unittests",
+#      "includes": [
+#        "sandbox_linux_test_sources.gypi",
+#      ],
+#      "type": "shared_library",
+#      "conditions": [
+#        [ "OS == "android"", {
+#          "dependencies": [
+#            "../testing/android/native_test.gyp:native_test_native_code",
+#          ],
+#        }],
+#      ],
+#    },
 
 component("seccomp_bpf") {
   sources = [
     "bpf_dsl/bpf_dsl.cc",
     "bpf_dsl/bpf_dsl.h",
     "bpf_dsl/bpf_dsl_forward.h",
     "bpf_dsl/bpf_dsl_impl.h",
     "bpf_dsl/codegen.cc",
     "bpf_dsl/codegen.h",
     "bpf_dsl/cons.h",
@@ skipping 195 matching lines @@
   #      'type': 'none',
   #      'variables': {
   #        'test_suite_name': 'sandbox_linux_jni_unittests',
   #      },
   #      'dependencies': [
   #        'sandbox_linux_jni_unittests',
   #      ],
   #      'includes': [ '../../build/apk_test.gypi' ],
   #      }
 }