| 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 'sys_string_conversions_mac.cc', | 161 'sys_string_conversions_mac.cc', |
| 162 'worker_pool_mac.mm', | 162 'worker_pool_mac.mm', |
| 163 ]) | 163 ]) |
| 164 | 164 |
| 165 if env['PLATFORM'] == 'posix': | 165 if env['PLATFORM'] == 'posix': |
| 166 input_files.extend([ | 166 input_files.extend([ |
| 167 'atomicops_internals_x86_gcc.cc', | 167 'atomicops_internals_x86_gcc.cc', |
| 168 'base_paths_linux.cc', | 168 'base_paths_linux.cc', |
| 169 'file_util_linux.cc', | 169 'file_util_linux.cc', |
| 170 'hmac_nss.cc', | 170 'hmac_nss.cc', |
| 171 'message_pump_glib.cc', |
| 171 'nss_init.cc', | 172 'nss_init.cc', |
| 172 'sys_string_conversions_linux.cc', | 173 'sys_string_conversions_linux.cc', |
| 173 'worker_pool.cc', | 174 'worker_pool.cc', |
| 174 ]) | 175 ]) |
| 175 | 176 |
| 176 env.ChromeStaticLibrary('base', input_files) | 177 env.ChromeStaticLibrary('base', input_files) |
| 177 | 178 |
| 178 | 179 |
| 179 env_tests.Prepend( | 180 env_tests.Prepend( |
| 180 CPPPATH = [ | 181 CPPPATH = [ |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 | 345 |
| 345 env.Alias('base', ['.', installed_base_unittests]) | 346 env.Alias('base', ['.', installed_base_unittests]) |
| 346 | 347 |
| 347 # TODO(sgk) should this be moved into base.lib like everything else? This will | 348 # TODO(sgk) should this be moved into base.lib like everything else? This will |
| 348 # require updating a bunch of other SConscripts which link directly against | 349 # require updating a bunch of other SConscripts which link directly against |
| 349 # this generated object file. | 350 # this generated object file. |
| 350 env_tests.StaticObject('perftimer.cc') | 351 env_tests.StaticObject('perftimer.cc') |
| 351 | 352 |
| 352 # Since run_all_perftests supplies a main, we cannot have it in base.lib | 353 # Since run_all_perftests supplies a main, we cannot have it in base.lib |
| 353 env_tests.StaticObject('run_all_perftests.cc') | 354 env_tests.StaticObject('run_all_perftests.cc') |
| 354 | |
| OLD | NEW |