Build nacl_helper_nonsfi with GN

media/BUILD.gn

Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 55fabdef4f4304ceeca11bc4722cbf86e3e645ee..899374279f1af36fc9d983d44aa1e0262befe51f 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/linux/pkg_config.gni")
+import("//build/config/nacl/config.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
 import("//testing/test.gni")
@@ -850,14 +851,24 @@ component("shared_memory_support") {
     "base/vector_math.cc",
     "base/vector_math.h",
   ]
+  if (is_nacl_nonsfi) {
+    sources -= [
+      "audio/audio_parameters.cc",

[Mark Seaborn, 2015/10/22 21:48:30]

This doesn't seem to correspond to any conditionalisation in the Gyp build.

If this conditionalisation is needed, could you add a comment explaining why? 
e.g. Do sources not compile?

Do you know which of the conditionalisations you're adding match the Gyp build
and which don't?

[Petr Hosek, 2015/10/23 03:01:15]

shared_memory_support_nacl in Gyp includes some bits of geometry which is
different to how shared_memory_support is defined in GN. These 4 files are the
only one which actually require geometry and they don't seem to be needed.
However, geometry seems to build fine with pnacl-clang so I can drop this
condition altogether.

+      "audio/audio_parameters.h",
+      "audio/point.cc",
+      "audio/point.h",
+    ]
+  }
   configs += [
     ":media_config",
     ":media_implementation",
   ]
   deps = [
     "//base",
-    "//ui/gfx/geometry",
   ]
+  if (!is_nacl_nonsfi) {
+    deps += [ "//ui/gfx/geometry" ]
+  }
 }
 
 if (media_use_ffmpeg) {