diff options
| -rw-r--r-- | base/SConscript | 23 | ||||
| -rw-r--r-- | build/SConscript.v8 | 2 | ||||
| -rw-r--r-- | chrome/SConscript.unit_tests | 3 | ||||
| -rw-r--r-- | chrome/browser/SConscript | 1 |
4 files changed, 21 insertions, 8 deletions
diff --git a/base/SConscript b/base/SConscript index 24dfe86..f4fc47a 100644 --- a/base/SConscript +++ b/base/SConscript @@ -131,7 +131,12 @@ if env['PLATFORM'] == 'darwin': 'sys_string_conversions_mac.cc', ]) -if env['PLATFORM'] in ('darwin', 'linux2'): +if env['PLATFORM'] == 'posix': + input_files.extend([ + 'file_util_linux.cc', + ]) + +if env['PLATFORM'] in ('darwin', 'posix'): input_files.extend([ 'condition_variable_posix.cc', 'lock_impl_posix.cc', @@ -160,9 +165,6 @@ env_tests.Prepend( 'PNG_USER_CONFIG', 'CHROME_PNG_WRITE_SUPPORT', 'U_STATIC_IMPLEMENTATION', - '_WIN32_WINNT=0x0600', - 'WINVER=0x0600', - '_HAS_EXCEPTIONS=0', ], LIBS = [ 'base', @@ -188,6 +190,11 @@ if env['PLATFORM'] == 'win32': '/WX', '/Wp64', ], + CPPDEFINES = [ + '_WIN32_WINNT=0x0600', + 'WINVER=0x0600', + '_HAS_EXCEPTIONS=0', + ], LINKFLAGS = [ '/MANIFEST', '/DELAYLOAD:"dwmapi.dll"', @@ -223,6 +230,7 @@ test_files = [ 'gfx/rect_unittest.cc', 'gfx/uniscribe_unittest.cc', 'gfx/vector_canvas_unittest.cc', + 'idletimer_unittest.cc', 'hmac_unittest.cc', 'json_reader_unittest.cc', 'json_writer_unittest.cc', @@ -242,19 +250,20 @@ test_files = [ 'singleton_unittest.cc', 'stack_container_unittest.cc', 'stats_table_unittest.cc', - 'string_tokenizer_unittest.cc', + 'string_escape_unittest.cc', 'string_piece_unittest.cc', + 'string_tokenizer_unittest.cc', 'string_util_unittest.cc', 'thread_local_storage_unittest.cc', 'thread_unittest.cc', - 'tracked_objects_test.cc', 'time_unittest.cc', 'timer_unittest.cc', + 'tracked_objects_test.cc', 'values_unittest.cc', 'waitable_event_unittest.cc', 'win_util_unittest.cc', - 'word_iterator_unittest.cc', 'wmi_util_unittest.cc', + 'word_iterator_unittest.cc', ] if env['PLATFORM'] == 'win32': diff --git a/build/SConscript.v8 b/build/SConscript.v8 index f05840d..b3ec128 100644 --- a/build/SConscript.v8 +++ b/build/SConscript.v8 @@ -47,7 +47,7 @@ v8 = env.Command(v8_scons_targets, [], 'cd ..\\v8 && $PYTHON $SCONS $SCONSFLAGS ${TARGETS[:-1]}', SCONS='..\\third_party\\scons\\scons.py', - SCONSFLAGS='-Q -q --warn=no-deprecated') + SCONSFLAGS='-Q --warn=no-deprecated') env.AlwaysBuild(v8) env.Install('$V8_DIR', v8) diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests index 09d51c1..3ffb96a 100644 --- a/chrome/SConscript.unit_tests +++ b/chrome/SConscript.unit_tests @@ -181,12 +181,14 @@ unit_test_files = [ 'browser/session_service_unittest.cc',
'browser/site_instance_unittest.cc',
'browser/tabs/tab_strip_model_unittest.cc',
+ 'browser/tabs/tab_dragging_test.cc',
'browser/template_url_model_unittest.cc',
'browser/template_url_parser_unittest.cc',
'browser/template_url_unittest.cc',
'browser/title_chomper_unittest.cc',
'browser/url_fetcher_unittest.cc',
'browser/url_fixer_upper_unittest.cc',
+ 'browser/views/bookmark_bar_view_test.cc',
'browser/visitedlink_unittest.cc',
'browser/web_contents_unittest.cc',
'browser/webdata/web_database_unittest.cc',
@@ -218,6 +220,7 @@ unit_test_files = [ 'views/grid_layout_unittest.cc',
'views/view_unittest.cc',
'test/testing_profile.cc',
+ 'test/ui/view_event_test_base.cc',
'test/unit/run_all_unittests.cc',
# Commented out for now because googleurl_tests doesn't build with
# gtest; see ../build/SConscript.googleurl.
diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript index cf92efa..0ed931d 100644 --- a/chrome/browser/SConscript +++ b/chrome/browser/SConscript @@ -332,6 +332,7 @@ input_files = [ 'views/go_button.cc',
'views/html_dialog_view.cc',
'views/hung_renderer_view.cc',
+ 'views/hwnd_html_view.cc',
'views/importer_lock_view.cc',
'views/importer_view.cc',
'views/importing_progress_view.cc',
|