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

ppapi/shared_impl/BUILD.gn

Index: ppapi/shared_impl/BUILD.gn
diff --git a/ppapi/shared_impl/BUILD.gn b/ppapi/shared_impl/BUILD.gn
index a70e0cf78ce1124106a75322b5385a40249619ee..db3c29411569285c80d5783099ee0c321e4f2f17 100644
--- a/ppapi/shared_impl/BUILD.gn
+++ b/ppapi/shared_impl/BUILD.gn
@@ -164,15 +164,16 @@ component("shared_impl") {
   #if (chrome_multiple_dll) {
   #  public_deps = [ "//third_party/WebKit/public:blink_minimal" ]
   #} else {
-  public_deps = [
-    "//third_party/WebKit/public:blink",
-  ]
+  if (!is_nacl) {

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

I think jam's patch just deletes this dependency in case you get a merge
conflict on this.

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

Yeah, I thought I deleted all these, I guess I missed one.

+    public_deps = [
+      "//third_party/WebKit/public:blink",
+    ]
+  }
 
   #}
   deps = [
     "//base",
     "//base:i18n",
-    "//base/third_party/dynamic_annotations",
     "//gpu/command_buffer/client",
     "//gpu/command_buffer/client:gles2_cmd_helper",
     "//gpu/command_buffer/client:gles2_implementation",
@@ -181,13 +182,19 @@ component("shared_impl") {
     "//media:shared_memory_support",
     "//ppapi/c",
     "//ppapi/thunk",
-    "//skia",
     "//third_party/icu:icuuc",
-    "//ui/events:events_base",
-    "//ui/surface",
     "//url",
   ]
 
+  if (!is_nacl) {
+    deps += [
+      "//base/third_party/dynamic_annotations",

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

Ditto about dynamic annotations.

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

Acknowledged.

+      "//skia",
+      "//ui/events:events_base",
+      "//ui/surface",
+    ]
+  }
+
   if (is_mac) {
     libs = [ "QuartzCore.framework" ]
   }