| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 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 Import('env') | 5 Import('env') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 env_tests = env.Clone() | 8 env_tests = env.Clone() |
| 9 | 9 |
| 10 env.Prepend( | 10 env.Prepend( |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 | 28 |
| 29 # These base files work on *all* platforms; files that don't work | 29 # These base files work on *all* platforms; files that don't work |
| 30 # cross-platform live below. | 30 # cross-platform live below. |
| 31 input_files = [ | 31 input_files = [ |
| 32 'at_exit.cc', | 32 'at_exit.cc', |
| 33 'base_paths.cc', | 33 'base_paths.cc', |
| 34 'base_switches.cc', | 34 'base_switches.cc', |
| 35 'bzip2_error_handler.cc', | 35 'bzip2_error_handler.cc', |
| 36 'command_line.cc', | 36 'command_line.cc', |
| 37 'debug_util.cc', | 37 'debug_util.cc', |
| 38 'field_trial.cc', |
| 38 'file_path.cc', | 39 'file_path.cc', |
| 39 'file_util.cc', | 40 'file_util.cc', |
| 40 'histogram.cc', | 41 'histogram.cc', |
| 41 'icu_util.cc', | 42 'icu_util.cc', |
| 42 'json_reader.cc', | 43 'json_reader.cc', |
| 43 'json_writer.cc', | 44 'json_writer.cc', |
| 44 'lazy_instance.cc', | 45 'lazy_instance.cc', |
| 45 'lock.cc', | 46 'lock.cc', |
| 46 'logging.cc', | 47 'logging.cc', |
| 47 'md5.cc', | 48 'md5.cc', |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 ) | 251 ) |
| 251 | 252 |
| 252 # These test files work on *all* platforms; tests that don't work | 253 # These test files work on *all* platforms; tests that don't work |
| 253 # cross-platform live below. | 254 # cross-platform live below. |
| 254 test_files = [ | 255 test_files = [ |
| 255 'at_exit_unittest.cc', | 256 'at_exit_unittest.cc', |
| 256 'atomicops_unittest.cc', | 257 'atomicops_unittest.cc', |
| 257 'clipboard_unittest.cc', | 258 'clipboard_unittest.cc', |
| 258 'command_line_unittest.cc', | 259 'command_line_unittest.cc', |
| 259 'condition_variable_unittest.cc', | 260 'condition_variable_unittest.cc', |
| 261 'field_trial_unittest.cc', |
| 260 'file_path_unittest.cc', | 262 'file_path_unittest.cc', |
| 261 'file_util_unittest.cc', | 263 'file_util_unittest.cc', |
| 262 'hmac_unittest.cc', | 264 'hmac_unittest.cc', |
| 263 'histogram_unittest.cc', | 265 'histogram_unittest.cc', |
| 264 'json_reader_unittest.cc', | 266 'json_reader_unittest.cc', |
| 265 'json_writer_unittest.cc', | 267 'json_writer_unittest.cc', |
| 266 'lazy_instance_unittest.cc', | 268 'lazy_instance_unittest.cc', |
| 267 'linked_ptr_unittest.cc', | 269 'linked_ptr_unittest.cc', |
| 268 'message_loop_unittest.cc', | 270 'message_loop_unittest.cc', |
| 269 'observer_list_unittest.cc', | 271 'observer_list_unittest.cc', |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 | 352 |
| 351 env.Alias('base', ['.', installed_base_unittests]) | 353 env.Alias('base', ['.', installed_base_unittests]) |
| 352 | 354 |
| 353 # TODO(sgk) should this be moved into base.lib like everything else? This will | 355 # TODO(sgk) should this be moved into base.lib like everything else? This will |
| 354 # require updating a bunch of other SConscripts which link directly against | 356 # require updating a bunch of other SConscripts which link directly against |
| 355 # this generated object file. | 357 # this generated object file. |
| 356 env_tests.StaticObject('perftimer.cc') | 358 env_tests.StaticObject('perftimer.cc') |
| 357 | 359 |
| 358 # Since run_all_perftests supplies a main, we cannot have it in base.lib | 360 # Since run_all_perftests supplies a main, we cannot have it in base.lib |
| 359 env_tests.StaticObject('run_all_perftests.cc') | 361 env_tests.StaticObject('run_all_perftests.cc') |
| OLD | NEW |