[go: nahoru, domu]

Pull GN binary at r275833

Also fixes some build errors on non-Linux platforms.

R=jamesr@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276063 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
index d78eee4..5f177e9 100644
--- a/ui/aura/BUILD.gn
+++ b/ui/aura/BUILD.gn
@@ -120,7 +120,7 @@
       "input_state_lookup.cc",
     ]
 
-    deps = [
+    deps += [
       "//ui/metro_viewer",
       "//ipc",
     ]
@@ -132,10 +132,11 @@
       "window_tree_host_ozone.h",
     ]
 
-    deps = [
-      "//ui/events/ozone",
-      "//ui/ozone",
-    ]
+    # TODO(GYP) enable when these targets exist.
+    #deps += [
+    #  "//ui/events/ozone",
+    #  "//ui/ozone",
+    #]
   }
 }
 
@@ -182,7 +183,7 @@
   ]
 
   if (is_win) {
-    cflags += [
+    cflags = [
       "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     ]
   }