diff options
Diffstat (limited to 'chrome')
34 files changed, 100 insertions, 77 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 4942449..b9bbb33 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -23,7 +23,7 @@ env.Prepend( # TODO(port) -if env_res['PLATFORM'] == 'win32': +if env_res.Bit('windows'): env_res.Append( CPPPATH = [ '.', @@ -139,7 +139,7 @@ env_dll.Append( ], ) -if env_dll['PLATFORM'] == 'win32': +if env_dll.Bit('windows'): env_dll.Append( LIBS = [ # TODO(sgk): to be ported to Mac and Linux @@ -190,7 +190,7 @@ if env_dll['PLATFORM'] == 'win32': input_files = [] -if env_dll['PLATFORM'] == 'win32': +if env_dll.Bit('windows'): input_files.extend([ 'app/chrome_dll_main.cc', '$V8_DIR/snapshot-empty$OBJSUFFIX', @@ -226,7 +226,7 @@ grit_files.extend(google_chrome) # TODO(port) -if env_dll['PLATFORM'] == 'win32': +if env_dll.Bit('windows'): dll_targets = env_dll.ChromeSharedLibrary('chrome_dll/chrome', dll_resources + input_files, PDB='chrome_dll.pdb') @@ -300,7 +300,7 @@ env_exe.Append( ) # TODO(port) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): chrome_exe = env_exe.ChromeProgram( 'chrome_exe/chrome', [ @@ -366,7 +366,7 @@ flats = [ ] # TODO(port) -if env_flat['PLATFORM'] == 'win32': +if env_flat.Bit('windows'): flats_out = [] for i in flats: flats_out.extend(env_flat.FlatHtml(i)) @@ -383,7 +383,7 @@ if not env.WantSystemLib('sqlite'): sconscript_files.append('$THIRD_PARTY_DIR/sqlite/SConscript') # TODO(port) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): sconscript_files.extend([ 'app/resources/SConscript', 'app/theme/SConscript', @@ -394,7 +394,7 @@ if env['PLATFORM'] == 'win32': env.SConscript(sconscript_files, exports=['env', 'env_res', 'env_test']) # TODO(port) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.InstallAs('$LIBS_DIR/${LIBPREFIX}jscre${LIBSUFFIX}', '$WEBKIT_DIR/JavaScriptCore_pcre.lib') @@ -408,7 +408,7 @@ gears_plugins = [ ] # TODO(port) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Install('$DESTINATION_ROOT/plugins/gears', gears_plugins) env.Command('$DESTINATION_ROOT/resources/inspector', diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 840013f..587da3c 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -30,7 +30,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CPPPATH = [ '$CHROME_DIR/tools/build/win', @@ -39,7 +39,7 @@ if env['PLATFORM'] == 'win32': input_files = [] -if env['PLATFORM'] in ('posix', 'win32'): +if not env.Bit('mac'): # TODO: Port to Mac. input_files.extend([ 'autocomplete/keyword_provider.cc', @@ -117,7 +117,7 @@ if env['PLATFORM'] in ('posix', 'win32'): 'webdata/web_database.cc', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # TODO: Port these. input_files.extend([ 'autofill_manager.cc', @@ -300,11 +300,11 @@ if env['PLATFORM'] == 'win32': 'web_contents_view_win.cc', ]) -if env['PLATFORM'] in ('darwin', 'posix'): +if env.Bit('posix'): input_files.extend([ 'importer/firefox_profile_lock_posix.cc', ]) -if env['PLATFORM'] in ('posix', 'win32'): +if not env.Bit('mac'): # TODO: This should work for all platforms. env.ChromeStaticLibrary('browser', input_files) diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons index 7dce9b4..2846f89 100644 --- a/chrome/browser/debugger/debugger.scons +++ b/chrome/browser/debugger/debugger.scons @@ -36,7 +36,7 @@ input_files = [ 'debugger_wrapper.cc', ] -if env['PLATFORM'] != 'win32': +if env.Bit('linux'): # TODO(port): Port these. remove_list = [ 'debugger_contents.cc', @@ -49,7 +49,20 @@ if env['PLATFORM'] != 'win32': for file in remove_list: input_files.remove(file) -if env['PLATFORM'] in ('posix', 'win32'): +if env.Bit('mac'): + # TODO(port): Port these. + remove_list = [ + 'debugger_contents.cc', + 'debugger_host_impl.cpp', + 'debugger_node.cc', + 'debugger_shell.cc', + 'debugger_view.cc', + 'debugger_window.cc', + ] + for file in remove_list: + input_files.remove(file) + +if not env.Bit('mac'): # TODO(port): Enable for Mac. env.ChromeStaticLibrary('debugger', input_files) diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript index a0dcb2d..4c0e9c4 100644 --- a/chrome/browser/views/SConscript +++ b/chrome/browser/views/SConscript @@ -132,7 +132,7 @@ input_files = [ 'user_data_dir_dialog.cc', ] -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): input_files.extend([ 'find_bar_win.cc', ]) diff --git a/chrome/chrome.scons b/chrome/chrome.scons index f21de10..1081fc2 100644 --- a/chrome/chrome.scons +++ b/chrome/chrome.scons @@ -79,7 +79,7 @@ sconscript_files = env.ChromiumLoadComponentSConscripts( ) # TODO(port) -if env['PLATFORM'] != 'win32': +if env.AnyBits('linux', 'mac'): remove_files = [ 'installer/mini_installer/installer_unittests.scons', 'installer/mini_installer/mini_installer.scons', diff --git a/chrome/common/common.scons b/chrome/common/common.scons index 371d2df4..5b82155 100644 --- a/chrome/common/common.scons +++ b/chrome/common/common.scons @@ -32,7 +32,7 @@ env.Append( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CPPPATH = [ '$CHROME_DIR/tools/build/win', @@ -41,7 +41,7 @@ if env['PLATFORM'] == 'win32': input_files = [] -if env['PLATFORM'] in ('posix', 'win32'): +if not env.Bit('mac'): # TODO(port): Port to Mac. input_files.extend([ 'animation.cc', @@ -77,7 +77,7 @@ if env['PLATFORM'] in ('posix', 'win32'): 'visitedlink_common.cc', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # TODO(port): Port these. input_files.extend([ 'child_process.cc', @@ -111,24 +111,24 @@ if env['PLATFORM'] == 'win32': 'worker_thread_ticker.cc', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # Windows specific files input_files.extend([ 'gfx/chrome_font_win.cc', 'ipc_channel_win.cc', ]) -elif env['PLATFORM'] == 'posix': +elif env.Bit('linux'): input_files.extend([ 'gfx/chrome_canvas_skia.cc', 'gfx/chrome_font_skia.cc', ]) -if env['PLATFORM'] in ['posix', 'mac']: +if env.Bit('posix'): input_files.extend([ 'ipc_channel_posix.cc', ]) -if env['PLATFORM'] in ('posix', 'win32'): +if not env.Bit('mac'): # TODO(port): This should be enabled for all platforms. env.ChromeStaticLibrary('common', input_files) diff --git a/chrome/common/ipc_tests.scons b/chrome/common/ipc_tests.scons index d4d534d..27d8f8e 100644 --- a/chrome/common/ipc_tests.scons +++ b/chrome/common/ipc_tests.scons @@ -20,7 +20,7 @@ env.SConscript([ '$ZLIB_DIR/using_zlib.scons', ], {'env':env}) -if env['PLATFORM'] in ('posix', 'darwin'): +if env.Bit('posix'): env.SConscript([ '$LIBEVENT_DIR/using_libevent.scons', ], {'env':env}) @@ -43,14 +43,14 @@ env.Prepend( ] ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CPPPATH = [ '$CHROME_DIR/tools/build/win', ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Append( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/installer/mini_installer/installer_unittests.scons b/chrome/installer/mini_installer/installer_unittests.scons index 13119b9..9dd31f2 100644 --- a/chrome/installer/mini_installer/installer_unittests.scons +++ b/chrome/installer/mini_installer/installer_unittests.scons @@ -22,7 +22,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.FilterOut( LIBS = ['DelayImp.lib'], ) diff --git a/chrome/installer/mini_installer/mini_installer.scons b/chrome/installer/mini_installer/mini_installer.scons index f9d0dd2..89c0d62 100644 --- a/chrome/installer/mini_installer/mini_installer.scons +++ b/chrome/installer/mini_installer/mini_installer.scons @@ -12,11 +12,11 @@ env.ApplySConscript([ # TODO(port): Don't be too fooled by the presence of all the -# if env['PLATFORM'] == 'win32' tests in this file into thinking +# if env.Bit('windows') tests in this file into thinking # this is necessarily portable. They're just there to wall off the # obviously windows-specific things -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env_res = env.Clone() env_res.Append( @@ -42,7 +42,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.FilterOut( LIBS = ['DelayImp.lib'], CCFLAGS = ['/RTC1'], @@ -80,7 +80,7 @@ input_files = [ "pe_resource.cc", ] -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): input_files.extend([ "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj", "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj", @@ -109,6 +109,6 @@ exe_version_rc = env.ChromeVersionRC('mini_installer_exe_version.rc', 'mini_installer_exe_version.rc.version', PWD=Dir('.')) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # TODO(sgk): implicit dependency should be picked up automatically env_res.Depends(resources, exe_version_rc) diff --git a/chrome/installer/setup/setup.scons b/chrome/installer/setup/setup.scons index 1a73359..b0ef23b 100644 --- a/chrome/installer/setup/setup.scons +++ b/chrome/installer/setup/setup.scons @@ -13,7 +13,7 @@ env.ApplySConscript([ '$LZMA_SDK_DIR/using_lzma_sdk.scons', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env_res = env.Clone() env_res.Append( @@ -46,7 +46,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', @@ -87,6 +87,6 @@ exe_version_rc = env.ChromeVersionRC('setup_exe_version.rc', 'setup_exe_version.rc.version', PWD = env.Dir('.')) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # TODO(sgk): implicit dependency should be picked up automatically env_res.Depends(resources, exe_version_rc) diff --git a/chrome/plugin/plugin.scons b/chrome/plugin/plugin.scons index 1a54366..c26768a 100644 --- a/chrome/plugin/plugin.scons +++ b/chrome/plugin/plugin.scons @@ -17,7 +17,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CPPPATH = [ '$CHROME_DIR/tools/build/win', @@ -38,7 +38,7 @@ input_files = [ 'webplugin_proxy.cc', ] -if env['PLATFORM'] in ('posix', 'darwin'): +if env.Bit('posix'): # TODO(port) to_be_ported_files = [ 'chrome_plugin_host.cc', diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons index 50161ac..279b143 100644 --- a/chrome/renderer/renderer.scons +++ b/chrome/renderer/renderer.scons @@ -20,7 +20,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CPPPATH = [ '$CHROME_DIR/tools/build/win', @@ -53,7 +53,7 @@ input_files = [ ] # TODO(port): Port these to Linux -if env['PLATFORM'] == 'posix': +if env.Bit('linux'): to_be_ported_files = [ 'chrome_plugin_host.cc', 'debug_message_handler.cc', @@ -72,7 +72,7 @@ if env['PLATFORM'] == 'posix': input_files.remove(remove) # TODO(port): Port these to Mac -if env['PLATFORM'] == 'darwin': +if env.Bit('mac'): to_be_ported_files = [ 'about_handler.cc', 'chrome_plugin_host.cc', @@ -100,5 +100,5 @@ if env['PLATFORM'] == 'darwin': # TODO(port): Enable for Mac. -if env['PLATFORM'] in ('posix', 'win32'): +if not env.Bit('mac'): env.ChromeStaticLibrary('renderer', input_files) diff --git a/chrome/test/activex_test_control/activex_test_control.scons b/chrome/test/activex_test_control/activex_test_control.scons index 39beb08..a971b48 100644 --- a/chrome/test/activex_test_control/activex_test_control.scons +++ b/chrome/test/activex_test_control/activex_test_control.scons @@ -13,7 +13,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.scons b/chrome/test/automated_ui_tests/automated_ui_tests.scons index 93d1774..a483ab9 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.scons +++ b/chrome/test/automated_ui_tests/automated_ui_tests.scons @@ -33,7 +33,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CPPPATH = [ '$CHROME_DIR/tools/build/win', diff --git a/chrome/test/chrome_plugin/test_chrome_plugin.scons b/chrome/test/chrome_plugin/test_chrome_plugin.scons index e2934cd..e7d3661 100644 --- a/chrome/test/chrome_plugin/test_chrome_plugin.scons +++ b/chrome/test/chrome_plugin/test_chrome_plugin.scons @@ -18,7 +18,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', @@ -45,7 +45,7 @@ input_files = [ 'test_chrome_plugin.cc', ] -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): input_files.extend([ 'test_chrome_plugin.def', ]) diff --git a/chrome/test/interactive_ui/interactive_ui_tests.scons b/chrome/test/interactive_ui/interactive_ui_tests.scons index eda7f26..fe92cf0 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.scons +++ b/chrome/test/interactive_ui/interactive_ui_tests.scons @@ -62,7 +62,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/memory_test/memory_test.scons b/chrome/test/memory_test/memory_test.scons index af86998..84871c9 100644 --- a/chrome/test/memory_test/memory_test.scons +++ b/chrome/test/memory_test/memory_test.scons @@ -35,7 +35,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/mini_installer_test/mini_installer_test.scons b/chrome/test/mini_installer_test/mini_installer_test.scons index 32da07b..7014079 100644 --- a/chrome/test/mini_installer_test/mini_installer_test.scons +++ b/chrome/test/mini_installer_test/mini_installer_test.scons @@ -32,7 +32,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/page_cycler/page_cycler_tests.scons b/chrome/test/page_cycler/page_cycler_tests.scons index dfb8cb8..46e35fc 100644 --- a/chrome/test/page_cycler/page_cycler_tests.scons +++ b/chrome/test/page_cycler/page_cycler_tests.scons @@ -34,7 +34,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/perf/perftests.scons b/chrome/test/perf/perftests.scons index c089027..97e57d3 100644 --- a/chrome/test/perf/perftests.scons +++ b/chrome/test/perf/perftests.scons @@ -30,7 +30,7 @@ env.Prepend( ], ) -if env['PLATFORM'] in ('posix', 'darwin'): +if env.Bit('posix'): env.SConscript([ '$LIBEVENT_DIR/using_libevent.scons', ], {'env':env}) @@ -45,7 +45,7 @@ input_files = [ '$CHROME_DIR/common/json_value_serializer_perftest.cc', ] -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LIBS = [ 'rpcrt4', @@ -54,7 +54,7 @@ if env['PLATFORM'] == 'win32': ] ) -if env['PLATFORM'] != 'win32': +if env.Bit('linux'): # TODO(port): Port these files. remove_files = [ 'url_parse_perftest.cc', @@ -64,5 +64,15 @@ if env['PLATFORM'] != 'win32': for file in remove_files: input_files.remove(file) -if env['PLATFORM'] in ('posix', 'win32'): +if env.Bit('mac'): + # TODO(port): Port these files. + remove_files = [ + 'url_parse_perftest.cc', + '$CHROME_DIR/browser/visitedlink_master$OBJSUFFIX', + '$CHROME_DIR/browser/visitedlink_perftest.cc', + ] + for file in remove_files: + input_files.remove(file) + +if not env.Bit('mac'): env.ChromeTestProgram('perf_tests', input_files) diff --git a/chrome/test/plugin/plugin_tests.scons b/chrome/test/plugin/plugin_tests.scons index da7e348..fb0508b 100644 --- a/chrome/test/plugin/plugin_tests.scons +++ b/chrome/test/plugin/plugin_tests.scons @@ -37,7 +37,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/reliability/reliability_tests.scons b/chrome/test/reliability/reliability_tests.scons index 4b14f6d..8f6ad5f 100644 --- a/chrome/test/reliability/reliability_tests.scons +++ b/chrome/test/reliability/reliability_tests.scons @@ -36,7 +36,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/security_tests/security_tests.scons b/chrome/test/security_tests/security_tests.scons index a3a9c3a..2fdf83f 100644 --- a/chrome/test/security_tests/security_tests.scons +++ b/chrome/test/security_tests/security_tests.scons @@ -12,7 +12,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/selenium/selenium_tests.scons b/chrome/test/selenium/selenium_tests.scons index b359940..8d98dd1 100644 --- a/chrome/test/selenium/selenium_tests.scons +++ b/chrome/test/selenium/selenium_tests.scons @@ -40,7 +40,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/startup/startup_tests.scons b/chrome/test/startup/startup_tests.scons index f857656..5ff685e 100644 --- a/chrome/test/startup/startup_tests.scons +++ b/chrome/test/startup/startup_tests.scons @@ -34,7 +34,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/tab_switching/tab_switching_test.scons b/chrome/test/tab_switching/tab_switching_test.scons index d1932db..f4e63e9 100644 --- a/chrome/test/tab_switching/tab_switching_test.scons +++ b/chrome/test/tab_switching/tab_switching_test.scons @@ -34,7 +34,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/test/ui/ui_tests.scons b/chrome/test/ui/ui_tests.scons index 202ce96..53113482 100644 --- a/chrome/test/ui/ui_tests.scons +++ b/chrome/test/ui/ui_tests.scons @@ -45,7 +45,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CPPPATH = [ '$CHROME_DIR/tools/build/win', @@ -123,7 +123,7 @@ ui_test_files = [ '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', ] -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): ui_test_files.extend([ '$CHROME_DIR/browser/views/find_bar_win_interactive_uitest.cc', '$CHROME_DIR/browser/views/find_bar_win_uitest.cc', diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 3848d30..3c25fb7 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -26,12 +26,12 @@ env.SConscript([ '$ZLIB_DIR/using_zlib.scons', ], {'env':env}) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.SConscript([ '$SDCH_DIR/using_sdch.scons', ], {'env':env}) -if env['PLATFORM'] in ('posix', 'darwin'): +if env.Bit('posix'): env.SConscript([ '$LIBEVENT_DIR/using_libevent.scons', ], {'env':env}) @@ -60,14 +60,14 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CPPPATH = [ '$CHROME_DIR/tools/build/win', ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # TODO(port): Port or mark as Windows-specific. env.Prepend( LIBS = [ @@ -109,7 +109,7 @@ if env['PLATFORM'] == 'win32': unit_test_files = [] -if env['PLATFORM'] in ('posix', 'win32'): +if not env.Bit('mac'): # TODO(port): Port to Mac. unit_test_files.extend([ 'run_all_unittests.cc', @@ -143,7 +143,7 @@ if env['PLATFORM'] in ('posix', 'win32'): '$CHROME_DIR/renderer/greasemonkey_slave_unittest.cc', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): # TODO(port): Port these. unit_test_files.extend([ '$CHROME_DIR/browser/autocomplete/autocomplete_unittest.cc', @@ -244,7 +244,7 @@ if env['PLATFORM'] == 'win32': '$CHROME_DIR/test/data/resource.res', ]) -if env['PLATFORM'] in ('posix', 'win32'): +if not env.Bit('mac'): # TODO(port): This should work on all platforms. unit_tests = env.ChromeTestProgram('unit_tests', unit_test_files) diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript index 5c76531..8941451 100644 --- a/chrome/third_party/hunspell/SConscript +++ b/chrome/third_party/hunspell/SConscript @@ -48,7 +48,7 @@ env.Append( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Append( CPPDEFINES = [ 'W32', @@ -60,7 +60,7 @@ if env['PLATFORM'] == 'win32': ], ) -if env['PLATFORM'] == 'posix': +if env.Bit('linux'): env.Append( CCFLAGS = [ '-Wno-parentheses', diff --git a/chrome/tools/convert_dict/convert_dict.scons b/chrome/tools/convert_dict/convert_dict.scons index b634294b..bec1668 100644 --- a/chrome/tools/convert_dict/convert_dict.scons +++ b/chrome/tools/convert_dict/convert_dict.scons @@ -15,7 +15,7 @@ env.ApplySConscript([ # '$ZLIB_DIR/using_zlib.scons', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LIBS = [ #'breakpad_handler', diff --git a/chrome/tools/crash_service/crash_service.scons b/chrome/tools/crash_service/crash_service.scons index db59307..b106369 100644 --- a/chrome/tools/crash_service/crash_service.scons +++ b/chrome/tools/crash_service/crash_service.scons @@ -15,7 +15,7 @@ env.ApplySConscript([ '$ZLIB_DIR/using_zlib.scons', ]) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( CPPPATH = [ '$CHROME_SRC_DIR', diff --git a/chrome/tools/perf/flush_cache/flush_cache.scons b/chrome/tools/perf/flush_cache/flush_cache.scons index cbd174d..88c6ee6 100644 --- a/chrome/tools/perf/flush_cache/flush_cache.scons +++ b/chrome/tools/perf/flush_cache/flush_cache.scons @@ -17,7 +17,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', diff --git a/chrome/tools/profiles/generate_profile.scons b/chrome/tools/profiles/generate_profile.scons index 9e601ea..533dc48 100644 --- a/chrome/tools/profiles/generate_profile.scons +++ b/chrome/tools/profiles/generate_profile.scons @@ -52,7 +52,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LIBS = [ 'rpcrt4', diff --git a/chrome/tools/test/image_diff/image_diff.scons b/chrome/tools/test/image_diff/image_diff.scons index 540d7a1..7451bfe 100644 --- a/chrome/tools/test/image_diff/image_diff.scons +++ b/chrome/tools/test/image_diff/image_diff.scons @@ -21,7 +21,7 @@ env.Prepend( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Prepend( LINKFLAGS = [ '/INCREMENTAL', |