Land prep work to enable NaCl in the Linux x64 GN builds.

ppapi/proxy/BUILD.gn

Index: ppapi/proxy/BUILD.gn
diff --git a/ppapi/proxy/BUILD.gn b/ppapi/proxy/BUILD.gn
index f6b7a6df91247ed570fef3b2d841975c17c06ffb..24fc8b636aabf9d18ee25733a5ad2b4f6336209c 100644
--- a/ppapi/proxy/BUILD.gn
+++ b/ppapi/proxy/BUILD.gn
@@ -180,8 +180,12 @@ component("proxy") {
     "url_response_info_resource.cc",
     "url_response_info_resource.h",
     "var_serialization_rules.h",
+    "video_decoder_resource.cc",
+    "video_decoder_resource.h",
     "video_destination_resource.cc",
     "video_destination_resource.h",
+    "video_encoder_resource.cc",
+    "video_encoder_resource.h",
     "video_frame_resource.cc",
     "video_frame_resource.h",
     "video_source_resource.cc",
@@ -258,10 +262,6 @@ component("proxy") {
       "talk_resource.h",
       "video_capture_resource.cc",
       "video_capture_resource.h",
-      "video_decoder_resource.cc",
-      "video_decoder_resource.h",
-      "video_encoder_resource.cc",
-      "video_encoder_resource.h",
     ]
   }
 
@@ -269,8 +269,6 @@ component("proxy") {
 
   deps = [
     "//base",
-    "//base/third_party/dynamic_annotations",
-    "//gin",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/ipc",
     "//ipc",
@@ -278,17 +276,36 @@ component("proxy") {
     "//ppapi/c",
     "//ppapi/proxy:ipc",
     "//ppapi/shared_impl",
-    "//skia",
     "//third_party/icu",
-    "//ui/events:events_base",
-    "//ui/surface",
   ]
 
+  if (is_nacl) {
+    # TODO(dpranke) replace w/ a config to pick up the mojo/nacl gen dir.
+    include_dirs = [
+      "$root_build_dir/gen",
+      "//third_party/mojo/src",
+    ]

[Dirk Pranke, 2015/02/25 21:08:46]

or this ...

[brettw, 2015/02/25 21:27:30]

The gen dir should already be implicit, the mojo one should come from a mojo
config.

[Dirk Pranke, 2015/02/25 21:37:41]

Hence the TODO, I'll make sure it's TODO(GYP), also, and double-check the gen
dir.

+    deps += [
+      "//ui/events:latency_info",
+      "//mojo/nacl:mojo",
+    ]
+  } else {
+    deps += [
+      "//base/third_party/dynamic_annotations",
+      "//gin",
+      "//skia",
+      "//ui/events:events_base",
+      "//ui/surface",
+    ]
+  }
+
   # TODO(GYP) support chrome_multiple_dll
   #if (chrome_multiple_dll) {
   #  deps += [ "//third_party/WebKit/public:blink_minimal" ]
   #} else {
-  deps += [ "//third_party/WebKit/public:blink" ]
+  if (!is_nacl) {
+    deps += [ "//third_party/WebKit/public:blink" ]
+  }
 
   #}
 }
@@ -327,9 +344,13 @@ source_set("ipc") {
     "//ipc",
     "//ppapi/c",
     "//ppapi/shared_impl",
-    "//skia",
-    "//ui/events/ipc",
   ]
+  if (!is_nacl) {
+    deps += [
+      "//skia",
+      "//ui/events/ipc",
+    ]
+  }
 }
 
 source_set("test_support") {