diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 17:48:03 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 17:48:03 +0000 |
| commit | b2f44d16afbe3902e20ac5b5cc4e78ab6ab7b498 (patch) | |
| tree | fb817029a8211f5996857642fbe5fb5a70de08d7 /ui/aura | |
| parent | b2171c2c10969ff4062fdc5b3888e646c19ebec8 (diff) | |
| download | chromium_src-b2f44d16afbe3902e20ac5b5cc4e78ab6ab7b498.zip chromium_src-b2f44d16afbe3902e20ac5b5cc4e78ab6ab7b498.tar.gz chromium_src-b2f44d16afbe3902e20ac5b5cc4e78ab6ab7b498.tar.bz2 | |
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
Diffstat (limited to 'ui/aura')
| -rw-r--r-- | ui/aura/BUILD.gn | 13 |
1 files changed, 7 insertions, 6 deletions
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 @@ component("aura") { "input_state_lookup.cc", ] - deps = [ + deps += [ "//ui/metro_viewer", "//ipc", ] @@ -132,10 +132,11 @@ component("aura") { "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 @@ source_set("aura_test_support") { ] if (is_win) { - cflags += [ + cflags = [ "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. ] } |