Try to resuscitate the builds needed to do official GN builds.

R=brettw@chromium.org
BUG=

Review URL: https://codereview.chromium.org/699263002

Cr-Commit-Position: refs/heads/master@{#302737}

build/config/linux/BUILD.gn

@@ -118,8 +118,7 @@ if (!is_chromeos) {
   # These packages should _only_ be expected when building for a target.
   # If these extra checks are not run, gconf is required when building host
   # tools for a CrOS build.
-  if (current_toolchain == host_toolchain &&
-      host_toolchain == default_toolchain) {
+  if (current_toolchain == default_toolchain) {
     pkg_config("gconf") {
       packages = [ "gconf-2.0" ]
       defines = [ "USE_GCONF" ]

ui/display/BUILD.gn

@@ -55,19 +55,21 @@ component("display") {
 
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
-    sources -= [
-      "chromeos/x11/display_configurator_x11.cc",
-      "chromeos/x11/display_mode_x11.cc",
-      "chromeos/x11/display_mode_x11.h",
-      "chromeos/x11/display_snapshot_x11.cc",
-      "chromeos/x11/display_snapshot_x11.h",
-      "chromeos/x11/display_util_x11.cc",
-      "chromeos/x11/display_util_x11.h",
-      "chromeos/x11/native_display_delegate_x11.cc",
-      "chromeos/x11/native_display_delegate_x11.h",
-      "chromeos/x11/native_display_event_dispatcher_x11.cc",
-      "chromeos/x11/native_display_event_dispatcher_x11.h",
-    ]
+    if (is_chromeos) {
+      sources -= [
+        "chromeos/x11/display_configurator_x11.cc",
+        "chromeos/x11/display_mode_x11.cc",
+        "chromeos/x11/display_mode_x11.h",
+        "chromeos/x11/display_snapshot_x11.cc",
+        "chromeos/x11/display_snapshot_x11.h",
+        "chromeos/x11/display_util_x11.cc",
+        "chromeos/x11/display_util_x11.h",
+        "chromeos/x11/native_display_delegate_x11.cc",
+        "chromeos/x11/native_display_delegate_x11.h",
+        "chromeos/x11/native_display_event_dispatcher_x11.cc",
+        "chromeos/x11/native_display_event_dispatcher_x11.h",
+      ]
+    }
   }
 }