Build nacl_helper_nonsfi with GN

ppapi/proxy/BUILD.gn

Index: ppapi/proxy/BUILD.gn
diff --git a/ppapi/proxy/BUILD.gn b/ppapi/proxy/BUILD.gn
index e3bd8c5439c67896ac061385c527a600a1b610f9..e104511edb9661ba341a0229909f49c2fc3cb15d 100644
--- a/ppapi/proxy/BUILD.gn
+++ b/ppapi/proxy/BUILD.gn
@@ -2,6 +2,8 @@
 # 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" ]
 }
@@ -200,8 +202,6 @@ component("proxy") {
     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",
@@ -214,6 +214,12 @@ component("proxy") {
       "../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",
@@ -281,7 +287,6 @@ component("proxy") {
     "//ppapi/c",
     "//ppapi/proxy:ipc_sources",
     "//ppapi/shared_impl",
-    "//third_party/icu",
   ]
 
   if (!is_nacl) {
@@ -293,6 +298,10 @@ component("proxy") {
       "//ui/surface",
     ]
   }
+
+  if (!is_nacl_nonsfi) {
+    deps += [ "//third_party/icu" ]
+  }
 }
 
 group("ipc") {