Various fixes for 32-bit Linux GN builds that need to be tracked down.

mojo/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/ui.gni")
 
 group("mojo") {
   # Meta-target, don't link into production code.
   testonly = true
   deps = [
     ":tests",
     "//mojo/common",
     "//mojo/services",
-    "//third_party/mojo/src/mojo/public",
   ]
 
+  if (!(is_linux && target_cpu == "x86")) {
+    # TODO(GYP): Figure out if this needs to be supported. Right now
+    # it won't work on x86 official builds because it needs stuff in the
+    # sysroot that doesn't exist.
+    deps += [ "//third_party/mojo/src/mojo/public" ]
+  }
+
   if (is_android) {
     deps += [ "//mojo/android" ]
   }
 
   if (!is_component_build) {
     deps += [ "//mojo/runner" ]
   }
 }
 
 # TODO(GYP): Delete this after we've converted everything to GN.
@@ skipping 55 matching lines @@
       "//mojo/runner:mojo_runner_unittests",
       "//mojo/services/network:apptests",
       "//mojo/shell:mojo_shell_unittests",
     ]
 
     if (is_android) {
       deps += [ "//mojo/runner:mojo_runner_apptests_apk" ]
     }
   }
 }