| 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 | 8 |
| 9 env.SConscript([ | 9 env.SConscript([ |
| 10 '$BASE_DIR/using_base.scons', | 10 '$BASE_DIR/using_base.scons', |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 'browser', | 38 'browser', |
| 39 'browser_views', | 39 'browser_views', |
| 40 'common', | 40 'common', |
| 41 'npapi_layout_test_plugin', | 41 'npapi_layout_test_plugin', |
| 42 'npapi_test_plugin', | 42 'npapi_test_plugin', |
| 43 'port', | 43 'port', |
| 44 'security_tests', | 44 'security_tests', |
| 45 ], | 45 ], |
| 46 ) | 46 ) |
| 47 | 47 |
| 48 if env['PLATFORM'] == 'win32': | 48 if env.Bit('windows'): |
| 49 env.Prepend( | 49 env.Prepend( |
| 50 CPPPATH = [ | 50 CPPPATH = [ |
| 51 '$CHROME_DIR/tools/build/win', | 51 '$CHROME_DIR/tools/build/win', |
| 52 ], | 52 ], |
| 53 LINKFLAGS = [ | 53 LINKFLAGS = [ |
| 54 '/INCREMENTAL', | 54 '/INCREMENTAL', |
| 55 | 55 |
| 56 '/safeseh', | 56 '/safeseh', |
| 57 '/dynamicbase', | 57 '/dynamicbase', |
| 58 '/ignore:4199', | 58 '/ignore:4199', |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 '$CHROME_DIR/test/accessibility/browser_impl.cc', | 116 '$CHROME_DIR/test/accessibility/browser_impl.cc', |
| 117 '$CHROME_DIR/test/accessibility/keyboard_util.cc', | 117 '$CHROME_DIR/test/accessibility/keyboard_util.cc', |
| 118 '$CHROME_DIR/test/accessibility/registry_util.cc', | 118 '$CHROME_DIR/test/accessibility/registry_util.cc', |
| 119 '$CHROME_DIR/test/accessibility/tab_impl.cc', | 119 '$CHROME_DIR/test/accessibility/tab_impl.cc', |
| 120 '$CHROME_DIR/test/automation/automation_proxy_uitest.cc', | 120 '$CHROME_DIR/test/automation/automation_proxy_uitest.cc', |
| 121 '$CHROME_DIR/test/perf/mem_usage.cc', | 121 '$CHROME_DIR/test/perf/mem_usage.cc', |
| 122 '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX', | 122 '$CHROME_DIR/test/reliability/page_load_test$OBJSUFFIX', |
| 123 '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', | 123 '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', |
| 124 ] | 124 ] |
| 125 | 125 |
| 126 if env['PLATFORM'] == 'win32': | 126 if env.Bit('windows'): |
| 127 ui_test_files.extend([ | 127 ui_test_files.extend([ |
| 128 '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc', | 128 '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc', |
| 129 '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', | 129 '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', |
| 130 ]) | 130 ]) |
| 131 | 131 |
| 132 env.ChromeTestProgram('ui_tests', ui_test_files) | 132 env.ChromeTestProgram('ui_tests', ui_test_files) |
| OLD | NEW |