Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 | 9 |
| 10 'targets': [ | 10 'targets': [ |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 61 ['OS=="win"', { | 61 ['OS=="win"', { |
| 62 'dependencies': [ | 62 'dependencies': [ |
| 63 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2' | 63 '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2' |
| 64 ], | 64 ], |
| 65 }], | 65 }], |
| 66 ['OS=="linux" and chromeos==0 and use_x11==1', { | 66 ['OS=="linux" and chromeos==0 and use_x11==1', { |
| 67 'dependencies': [ | 67 'dependencies': [ |
| 68 '../../build/linux/system.gyp:atk', | 68 '../../build/linux/system.gyp:atk', |
| 69 '../../build/linux/system.gyp:gconf', | 69 '../../build/linux/system.gyp:gconf', |
| 70 '../../build/linux/system.gyp:glib', | 70 '../../build/linux/system.gyp:glib', |
| 71 '../../build/linux/system.gyp:dbus', | |
|
lgombos
2015/03/26 22:05:40
Do we need to guard this dependency with use_dbus=
| |
| 71 ], | 72 ], |
| 72 'variables': { | 73 'variables': { |
| 73 'clang_warning_flags': [ | 74 'clang_warning_flags': [ |
| 74 # glib uses the pre-c++11 typedef-as-static_assert hack. | 75 # glib uses the pre-c++11 typedef-as-static_assert hack. |
| 75 '-Wno-unused-local-typedefs', | 76 '-Wno-unused-local-typedefs', |
| 76 ], | 77 ], |
| 77 }, | 78 }, |
| 78 }], | 79 }], |
| 79 ['OS!="linux" or chromeos==1 or use_x11==0', { | 80 ['OS!="linux" or chromeos==1 or use_x11==0', { |
| 80 'sources!': [ | 81 'sources!': [ |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 177 'dependencies': [ | 178 'dependencies': [ |
| 178 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 179 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 179 ], | 180 ], |
| 180 }], | 181 }], |
| 181 ], | 182 ], |
| 182 }, | 183 }, |
| 183 ], | 184 ], |
| 184 }], | 185 }], |
| 185 ], | 186 ], |
| 186 } | 187 } |
| OLD | NEW |