Build nacl_helper_nonsfi with GN

ppapi/proxy/BUILD.gn

 # Copyright 2015 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/nacl/config.gni")
+
 config("proxy_implementation") {
   defines = [ "PPAPI_PROXY_IMPLEMENTATION" ]
 }
 
 component("proxy") {
   output_name = "ppapi_proxy"
 
   sources = [
     # Take some standalone files from the C++ wrapper allowing us to more
     # easily make async callbacks in the proxy. We can't depend on the
@@ skipping 178 matching lines @@
     "video_source_resource.cc",
     "video_source_resource.h",
     "websocket_resource.cc",
     "websocket_resource.h",
   ]
 
   if (is_nacl) {
     sources += [
       "../nacl_irt/irt_interfaces.cc",
       "../nacl_irt/irt_interfaces.h",
-      "../nacl_irt/irt_pnacl_translator_compile.cc",
-      "../nacl_irt/irt_pnacl_translator_link.cc",
       "../nacl_irt/irt_ppapi.cc",
       "../nacl_irt/irt_ppapi.h",
       "../nacl_irt/irt_start.cc",
       "../nacl_irt/manifest_service.cc",
       "../nacl_irt/manifest_service.h",
       "../nacl_irt/plugin_main.cc",
       "../nacl_irt/plugin_main.h",
       "../nacl_irt/plugin_startup.cc",
       "../nacl_irt/plugin_startup.h",
       "../nacl_irt/ppapi_dispatcher.cc",
       "../nacl_irt/ppapi_dispatcher.h",
     ]
+    if (!is_nacl_nonsfi) {
+      sources += [
+        "../nacl_irt/irt_pnacl_translator_compile.cc",

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

Can you put "#if !defined(OS_NACL_NONSFI)" into these source files instead,
please?  That makes the conditionalisation build-system-agnostic.

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

Done.

+        "../nacl_irt/irt_pnacl_translator_link.cc",
+      ]
+    }
   } else {
     sources += [
       "audio_input_resource.cc",
       "audio_input_resource.h",
       "broker_dispatcher.cc",
       "broker_dispatcher.h",
       "browser_font_singleton_resource.cc",
       "browser_font_singleton_resource.h",
       "device_enumeration_resource_helper.cc",
       "device_enumeration_resource_helper.h",
@@ skipping 47 matching lines @@
 
   deps = [
     "//base",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/ipc",
     "//ipc",
     "//media:shared_memory_support",
     "//ppapi/c",
     "//ppapi/proxy:ipc_sources",
     "//ppapi/shared_impl",
-    "//third_party/icu",
   ]
 
   if (!is_nacl) {
     deps += [
       "//base/third_party/dynamic_annotations",
       "//gin",
       "//skia",
       "//ui/events:events_base",
       "//ui/surface",
     ]
   }
+
+  if (!is_nacl_nonsfi) {
+    deps += [ "//third_party/icu" ]
+  }
 }
 
 group("ipc") {
   if (is_component_build) {
     public_deps = [
       "//ppapi/proxy",
     ]
   } else {
     public_deps = [
       ":ipc_sources",
@@ skipping 54 matching lines @@
   deps = [
     "//base/test:test_support",
     "//ipc",
     "//ipc:test_support",
     "//ppapi/proxy",
     "//ppapi/shared_impl",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }