Build nacl_helper_nonsfi with GN

media/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/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")
 
 # Common configuration for targets in the media directory.
 # NOT for exporting.
 config("media_config") {
   defines = []
   if (!media_use_libvpx) {
     defines += [ "MEDIA_DISABLE_LIBVPX" ]
@@ skipping 824 matching lines @@
     "audio/point.h",
     "base/audio_bus.cc",
     "base/audio_bus.h",
     "base/channel_layout.cc",
     "base/channel_layout.h",
     "base/limits.h",
     "base/media_export.h",
     "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) {
   test("ffmpeg_regression_tests") {
     sources = [
       "base/run_all_unittests.cc",
       "ffmpeg/ffmpeg_regression_tests.cc",
     ]
 
     configs += [ "//media:media_config" ]
 
     deps = [
       "//base/test:test_support",
       "//media",
       "//media:test_support",
       "//media/audio:test_support",
       "//media/base:test_support",
       "//media/test:pipeline_integration_tests",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/ffmpeg",
       "//ui/gfx/geometry",
       "//ui/gfx:test_support",
     ]
   }
 }