Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b

sandbox/linux/BUILD.gn

Index: sandbox/linux/BUILD.gn
diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
index 8b18a3a5f80ee0c06fab1354f5040e2b28994a5c..c4ce4fc138763bf2a728d3f27533604234f1d1e3 100644
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -11,7 +11,7 @@ declare_args() {
   compile_credentials = is_linux
 
   compile_seccomp_bpf_demo =
-      is_linux && (cpu_arch == "x86" || cpu_arch == "x64")
+      is_linux && (current_cpu == "x86" || current_cpu == "x64")
 }
 
 # We have two principal targets: sandbox and sandbox_linux_unittests
@@ -63,8 +63,10 @@ source_set("sandbox_linux_test_utils") {
   }
 }
 
-# The main sandboxing test target.
-test("sandbox_linux_unittests") {
+# Sources shared by sandbox_linux_unittests and sandbox_linux_jni_unittests.
+source_set("sandbox_linux_unittests_sources") {
+  testonly = true
+
   sources = [
     "services/proc_util_unittest.cc",
     "services/resource_limits_unittests.cc",
@@ -127,23 +129,24 @@ test("sandbox_linux_unittests") {
   }
 }
 
-# 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",
-#          ],
-#        }],
-#      ],
-#    },
+# 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" ]
+  }
+}
 
 component("seccomp_bpf") {
   sources = [