| 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 'platform_thread_mac.mm', | 151 'platform_thread_mac.mm', |
| 152 'sys_string_conversions_mac.cc', | 152 'sys_string_conversions_mac.cc', |
| 153 'worker_pool_mac.mm', | 153 'worker_pool_mac.mm', |
| 154 ]) | 154 ]) |
| 155 | 155 |
| 156 if env['PLATFORM'] == 'posix': | 156 if env['PLATFORM'] == 'posix': |
| 157 input_files.extend([ | 157 input_files.extend([ |
| 158 'atomicops_internals_x86_gcc.cc', | 158 'atomicops_internals_x86_gcc.cc', |
| 159 'base_paths_linux.cc', | 159 'base_paths_linux.cc', |
| 160 'file_util_linux.cc', | 160 'file_util_linux.cc', |
| 161 'message_pump_libevent.cc', |
| 161 'sys_string_conversions_linux.cc', | 162 'sys_string_conversions_linux.cc', |
| 162 'worker_pool.cc', | 163 'worker_pool.cc', |
| 163 ]) | 164 ]) |
| 164 | 165 |
| 165 env.ChromeStaticLibrary('base', input_files) | 166 env.ChromeStaticLibrary('base', input_files) |
| 166 | 167 |
| 167 | 168 |
| 168 env_tests.Prepend( | 169 env_tests.Prepend( |
| 169 CPPPATH = [ | 170 CPPPATH = [ |
| 170 '$GTEST_DIR/include', | 171 '$GTEST_DIR/include', |
| (...skipping 10 matching lines...) Expand all Loading... |
| 181 CPPDEFINES = [ | 182 CPPDEFINES = [ |
| 182 'UNIT_TEST', | 183 'UNIT_TEST', |
| 183 'PNG_USER_CONFIG', | 184 'PNG_USER_CONFIG', |
| 184 'CHROME_PNG_WRITE_SUPPORT', | 185 'CHROME_PNG_WRITE_SUPPORT', |
| 185 'U_STATIC_IMPLEMENTATION', | 186 'U_STATIC_IMPLEMENTATION', |
| 186 'GOOGLE_CHROME_BUILD', | 187 'GOOGLE_CHROME_BUILD', |
| 187 ], | 188 ], |
| 188 LIBS = [ | 189 LIBS = [ |
| 189 'base', | 190 'base', |
| 190 'base_gfx', | 191 'base_gfx', |
| 192 'event', |
| 191 'gtest', | 193 'gtest', |
| 192 'icuuc', | 194 'icuuc', |
| 193 'libpng', | 195 'libpng', |
| 194 'skia', | 196 'skia', |
| 195 'zlib', | 197 'zlib', |
| 196 ] | 198 ] |
| 197 ) | 199 ) |
| 198 | 200 |
| 199 env_tests.Append( | 201 env_tests.Append( |
| 200 CPPPATH = [ | 202 CPPPATH = [ |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 env.Alias('base', ['.', installed_base_unittests, icudata]) | 333 env.Alias('base', ['.', installed_base_unittests, icudata]) |
| 332 | 334 |
| 333 # TODO(sgk) should this be moved into base.lib like everything else? This will | 335 # TODO(sgk) should this be moved into base.lib like everything else? This will |
| 334 # require updating a bunch of other SConscripts which link directly against | 336 # require updating a bunch of other SConscripts which link directly against |
| 335 # this generated object file. | 337 # this generated object file. |
| 336 env_tests.StaticObject('perftimer.cc') | 338 env_tests.StaticObject('perftimer.cc') |
| 337 | 339 |
| 338 # Since run_all_perftests supplies a main, we cannot have it in base.lib | 340 # Since run_all_perftests supplies a main, we cannot have it in base.lib |
| 339 env_tests.StaticObject('run_all_perftests.cc') | 341 env_tests.StaticObject('run_all_perftests.cc') |
| 340 | 342 |
| OLD | NEW |