Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'variables' : { | 5 'variables' : { |
| 6 # Variables for js2gtest rules | 6 # Variables for js2gtest rules |
| 7 'gypv8sh': '../tools/gypv8sh.py', | 7 'gypv8sh': '../tools/gypv8sh.py', |
| 8 'js2gtest': 'test/base/js2gtest.js', | 8 'js2gtest': 'test/base/js2gtest.js', |
| 9 'mock_js': 'third_party/mock4js/mock4js.js', | 9 'mock_js': 'third_party/mock4js/mock4js.js', |
| 10 'test_api_js': 'test/data/webui/test_api.js', | 10 'test_api_js': 'test/data/webui/test_api.js', |
| (...skipping 2166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2177 '../dbus/dbus.gyp:dbus_test_support', | 2177 '../dbus/dbus.gyp:dbus_test_support', |
| 2178 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2178 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2179 ], | 2179 ], |
| 2180 'sources!': [ | 2180 'sources!': [ |
| 2181 'browser/printing/print_job_unittest.cc', | 2181 'browser/printing/print_job_unittest.cc', |
| 2182 ], | 2182 ], |
| 2183 }, { # else: toolkit_uses_gtk != 1 | 2183 }, { # else: toolkit_uses_gtk != 1 |
| 2184 'sources!': [ | 2184 'sources!': [ |
| 2185 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', | 2185 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', |
| 2186 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', | 2186 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', |
| 2187 '../views/focus/accelerator_handler_gtk_unittest.cc', | 2187 '../ui/views/focus/accelerator_handler_gtk_unittest.cc', |
|
Ben Goodger (Google)
2011/11/18 20:25:19
I suspect this line is no longer required.
| |
| 2188 ], | 2188 ], |
| 2189 }], | 2189 }], |
| 2190 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , { | 2190 ['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)' , { |
| 2191 'dependencies': [ | 2191 'dependencies': [ |
| 2192 '../build/linux/system.gyp:ssl', | 2192 '../build/linux/system.gyp:ssl', |
| 2193 'browser/chromeos/input_method/input_method.gyp:mozc_commands_proto' , | 2193 'browser/chromeos/input_method/input_method.gyp:mozc_commands_proto' , |
| 2194 ], | 2194 ], |
| 2195 }], | 2195 }], |
| 2196 ['use_gnome_keyring == 0', { | 2196 ['use_gnome_keyring == 0', { |
| 2197 # Disable the GNOME Keyring tests if we are not using it. | 2197 # Disable the GNOME Keyring tests if we are not using it. |
| (...skipping 2111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4309 # Use outputs of this action as inputs for the main target build. | 4309 # Use outputs of this action as inputs for the main target build. |
| 4310 # Seems as a misnomer but makes this happy on Linux (scons). | 4310 # Seems as a misnomer but makes this happy on Linux (scons). |
| 4311 'process_outputs_as_sources': 1, | 4311 'process_outputs_as_sources': 1, |
| 4312 }, | 4312 }, |
| 4313 ], # 'actions' | 4313 ], # 'actions' |
| 4314 }, | 4314 }, |
| 4315 ] | 4315 ] |
| 4316 }], # 'coverage!=0' | 4316 }], # 'coverage!=0' |
| 4317 ], # 'conditions' | 4317 ], # 'conditions' |
| 4318 } | 4318 } |
| OLD | NEW |