diff options
28 files changed, 118 insertions, 124 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 8ed4048..ee4de04 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -1006,7 +1006,7 @@ Other platform defines such as use_titlecase are declared in build/common.gypi. Preferences... </message> </if> - <if expr="os == 'linux2'"> + <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> <message name="IDS_PREFERENCES" desc="The text label of the Preferences menu item."> Preferences </message> @@ -2403,7 +2403,7 @@ Other platform defines such as use_titlecase are declared in build/common.gypi. <message name="IDS_CREATE_SHORTCUTS_QUICK_LAUNCH_BAR_CHKBOX" desc="Label of the checkbox to create an application shortcut in quick launch bar."> Quick launch bar </message> - <if expr="os == 'linux2' or os.find('bsd') != -1"> + <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> <message name="IDS_CREATE_SHORTCUTS_ERROR_TITLE" desc="Title of the error dialog box when creating an application shortcut failed."> Failed to Create Application Shortcut </message> @@ -6063,7 +6063,7 @@ Keep your key file in a safe place. You will need it to create new versions of y and make sure your configuration is set to "no proxy" or "direct." </message> </if> - <if expr="not pp_ifdef('chromeos') and (os == 'linux2' or os.find('bsd') != -1)"> + <if expr="not pp_ifdef('chromeos') and (os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')"> <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server."> Go to <ph name="BEGIN_BOLD"><strong></ph> @@ -6072,7 +6072,7 @@ Keep your key file in a safe place. You will need it to create new versions of y and make sure your configuration is set to "no proxy" or "direct." </message> </if> - <if expr="os != 'darwin' and os != 'linux2'"> + <if expr="os != 'darwin' and os != 'linux2' and os.find('bsd') == -1 and os != 'sunos5'"> <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Windows instructions for disabling use of a proxy server."> Go to <ph name="BEGIN_BOLD"><strong></ph> @@ -6191,7 +6191,7 @@ Keep your key file in a safe place. You will need it to create new versions of y to test your connection. </message> </if> - <if expr="os != 'darwin' and os != 'linux2'"> + <if expr="os != 'darwin' and os != 'linux2' and os.find('bsd') == -1 and os != 'sunos5'"> <message name="IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM" desc="Summary (platform dependent section) in the error page when the network connection failed. Describes how to get to the network Diagnostics screen under Windows 7 and later."> Go to <ph name="BEGIN_BOLD"><strong></ph> @@ -6849,7 +6849,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Settings </message> </if> - <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1)"> + <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')"> <message name="IDS_SETTINGS_TITLE" desc="Title for the settings tab."> Preferences </message> @@ -7186,7 +7186,7 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> </if> - <if expr="os == 'darwin' or (os =='linux2' and not pp_ifdef('chromeos'))"> + <if expr="os == 'darwin' or os.find('bsd') != -1 or os == 'sunos5' or (os =='linux2' and not pp_ifdef('chromeos'))"> <message name="IDS_AUTOFILL_OPTIONS_TITLE" desc="The title of the Autofill dialog."> Autofill Preferences </message> @@ -7403,7 +7403,7 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> </if> - <if expr="os == 'linux2' or os.find('bsd') != -1"> + <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> <message name="IDS_APPEARANCE_GROUP_NAME" desc="In Title Case: The title of the themes group"> Appearance </message> @@ -7487,7 +7487,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Some settings have been disabled by your IT administrator. </message> </if> - <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1)"> + <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')"> <message name="IDS_OPTIONS_MANAGED_PREFS" desc="Mac/Linux banner displayed in case there are managed options the user won't be able to change."> Some preferences have been disabled by your IT administrator. </message> @@ -7527,7 +7527,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Search settings </message> </if> - <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1)"> + <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5')"> <message name="IDS_OPTIONS_SEARCH_PLACEHOLDER" desc="Text placeholder for an empty search field on Mac/Linux."> Search preferences </message> @@ -9460,7 +9460,7 @@ Keep your key file in a safe place. You will need it to create new versions of y </if> <!-- os == 'darwin' --> <!-- Linux Global Menubar Menus --> - <if expr="os == 'linux2'"> + <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> <!-- Unity and some other GNOME configurations now have a permanent, Mac-like menu bar that lives outside the window at the top of the screen. The following strings should be in Linux style, not Mac @@ -12198,7 +12198,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Import bookmarks now... </message> - <if expr="os == 'linux2' or os == 'openbsd4' or os=='freebsd6'"> + <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> <!-- Linux proxy configuration fallback help --> <message name="IDS_ABOUT_LINUX_PROXY_CONFIG_TITLE" desc="Title of HTML page shown on systems where system proxy configuration is unsupported."> Proxy Configuration Help diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd index 4e70fe2..40238d9 100644 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -497,7 +497,7 @@ </message> <!-- The width and height for the "create application shortcuts error" dialog. --> - <if expr="os == 'linux2' or os.find('bsd') != -1"> + <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> <message name="IDS_CREATE_SHORTCUTS_ERROR_DIALOG_WIDTH_CHARS" use_name_for_id="true"> 60 </message> diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index d163e4c..a0a2063 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -12,13 +12,13 @@ <if expr="os.find('win') != -1"> <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts.html" flattenhtml="true" type="BINDATA" /> </if> - <if expr="os == 'linux2' or os.find('bsd') != -1"> + <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux.html" flattenhtml="true" type="BINDATA" /> </if> <if expr="os == 'darwin'"> <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.html" flattenhtml="true" type="BINDATA" /> </if> - <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1"> + <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1 and os != 'sunos5'"> <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" /> </if> <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" flattenhtml="true" type="BINDATA" /> diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 38b147c..57ef9a1 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -73,6 +73,10 @@ }], ], },], + ['os_posix == 1 and OS != "mac" and OS != "linux"', { + 'platform_locale_settings_grd': + 'app/resources/locale_settings_linux.grd', + },], ['OS=="mac"', { 'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist', 'nacl_defines': [ @@ -464,7 +468,7 @@ 'browser/debugger/inspectable_tab_proxy.h', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -488,7 +492,7 @@ '..', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -709,7 +713,7 @@ 'browser/sync/util/data_encryption.h', ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -840,7 +844,7 @@ 'service/cloud_print/print_system_win.cc', ], }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -1528,7 +1532,7 @@ }, ]}, # 'targets' ], # OS=="win" - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['os_posix == 1 and OS != "mac"', { 'targets': [{ 'target_name': 'packed_resources', 'type': 'none', @@ -1629,7 +1633,7 @@ }, ], }], # targets - }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" + }], # os_posix == 1 and OS != "mac" ], # 'conditions' } diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 0ce0575..7937bf6 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3580,7 +3580,7 @@ ['exclude', '^browser/chromeos/input_method/candidate_window.h'], ], }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:dbus-glib', '../build/linux/system.gyp:gconf', @@ -3648,7 +3648,7 @@ ], }], ], - }, { # OS != "linux" + }, { # toolkit_uses_gtk != 1 'sources!': [ # TODO(mattm): Cert manager stuff is really !USE_NSS. 'browser/certificate_manager_model.cc', @@ -3657,14 +3657,6 @@ 'browser/ui/webui/options/certificate_manager_handler.h', ], }], - ['OS=="freebsd" or OS=="openbsd"', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - '../build/linux/system.gyp:gtkprint', - '../build/linux/system.gyp:nss', - '../build/linux/system.gyp:x11', - ], - }], ['OS=="mac"', { 'sources!': [ 'browser/automation/automation_provider_list_generic.cc', @@ -4266,14 +4258,14 @@ }], # Exclude extension_input_ui_api again # (Required because of the '^browser/extensions/' include abrove) - ['OS=="linux" and ( touchui==0 or chromeos==0 )', { + ['toolkit_uses_gtk == 1 and ( touchui == 0 or chromeos == 0 )', { 'sources/': [ ['exclude', '^browser/extensions/extension_input_ui_api.cc'], ['exclude', '^browser/extensions/extension_input_ui_api.h'], ], }], # GTK build only - ['OS=="linux" and toolkit_views==0', { + ['toolkit_uses_gtk == 1 and toolkit_views == 0', { 'sources/': [ ['include', '^browser/printing/print_dialog_gtk.cc'], ['include', '^browser/printing/print_dialog_gtk.h'], @@ -4361,7 +4353,7 @@ }, ], }], - ['OS=="linux" and gcc_version==45', { + ['os_posix == 1 and OS != "mac" and gcc_version == 45', { # Avoid gcc 4.5 miscompilation of template_url.cc # as per http://crbug.com/41887 'cflags': [ diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 6a5d99b..a5d80c0 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -254,7 +254,7 @@ 'common/zip.h', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -270,7 +270,7 @@ ], }, },], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { + ['os_posix == 1 and OS != "mac"', { 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)', ], @@ -385,7 +385,7 @@ '../third_party/icu/icu.gyp:icuuc', ], 'conditions': [ - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + ['os_posix == 1 and OS != "mac"', { 'conditions': [ ['use_openssl==1', { 'dependencies': [ diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 15ae7bb..a11d90b 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -150,7 +150,7 @@ 'disable_pie%': 0, }, 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['os_posix == 1 and OS != "mac"', { 'actions': [ { 'action_name': 'manpage', diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index b094911..88cdb2d 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -187,7 +187,7 @@ '../third_party/mach_override/mach_override.gyp:mach_override', ], }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'conditions': [ [ 'linux_use_tcmalloc==1', { 'dependencies': [ @@ -201,11 +201,6 @@ '../sandbox/sandbox.gyp:sandbox', ], }], - ['OS=="openbsd" or OS=="freebsd"', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - }], ['OS=="win"', { 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index d5ba29e..933d313 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -208,7 +208,7 @@ ['exclude', '^browser/chromeos'], ], }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', @@ -263,7 +263,7 @@ 'chrome.gyp:crash_service', # run time dependency ], }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -348,7 +348,7 @@ 'test/unit/run_all_unittests.cc', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ # Needed for the following #include chain: # test/unit/run_all_unittests.cc @@ -395,7 +395,7 @@ }, }, },], - ['OS=="linux"', { + ['use_x11 == 1', { 'dependencies': [ '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], @@ -469,14 +469,14 @@ 'test/unit/chrome_test_suite.h', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], }], - ['OS=="linux" and toolkit_views==0', { + ['toolkit_uses_gtk == 1 and toolkit_views == 0', { 'sources!': [ # TODO(port) 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc', @@ -680,12 +680,12 @@ '../webkit/webkit.gyp:copy_npapi_test_plugin', ], }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], - }, { # else: OS != "linux" + }, { # else: toolkit_uses_gtk != 1 'sources!': [ 'browser/process_singleton_linux_uitest.cc', ], @@ -746,7 +746,7 @@ 'browser/printing/printing_layout_uitest.cc', ], }], - ['OS=="linux" or OS=="freebsd"', { + ['os_posix == 1 and OS != "mac"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -864,7 +864,7 @@ 'test/webdriver/commands/webelement_commands.cc', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', @@ -875,7 +875,7 @@ '../views/views.gyp:views', ], }], - ['OS=="linux" or OS=="freebsd"', { + ['os_posix == 1 and OS != "mac"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -1024,7 +1024,7 @@ ], },], # Set fPIC in case it isn't set. - ['(OS=="linux" or OS=="openbsd" or OS=="freebsd" or OS=="solaris")' + ['os_posix == 1 and OS != "mac"' 'and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', { 'cflags': ['-fPIC'], },], @@ -1997,7 +1997,7 @@ ['exclude', '^browser/ui/webui/chromeos/login'], ], }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'conditions': [ ['selinux==0', { 'dependencies': [ @@ -2027,14 +2027,14 @@ 'sources!': [ 'browser/printing/print_job_unittest.cc', ], - }, { # else: OS != "linux" + }, { # else: toolkit_uses_gtk != 1 'sources!': [ 'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc', 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc', '../views/focus/accelerator_handler_gtk_unittest.cc', ], }], - ['OS=="linux" or OS=="freebsd"', { + ['os_posix == 1 and OS != "mac"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -2557,7 +2557,7 @@ '../content/browser/child_process_security_policy_browsertest.cc', ], }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', @@ -2595,7 +2595,7 @@ 'browser/extensions/browser_action_test_util_mac.mm', ], }], - ['OS=="linux" or OS=="freebsd"', { + ['os_posix == 1 and OS != "mac"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -2728,7 +2728,7 @@ }, }, },], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', @@ -2759,7 +2759,7 @@ }, }, },], - ['OS=="linux" or OS=="freebsd"', { + ['os_posix == 1 and OS != "mac"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -2830,7 +2830,7 @@ }, }, },], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -2867,7 +2867,7 @@ }, }, },], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', @@ -2905,7 +2905,7 @@ 'test/tab_switching/tab_switching_test.cc', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', @@ -2940,7 +2940,7 @@ 'test/memory_test/memory_test.cc', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', @@ -3106,7 +3106,7 @@ 'browser/sync/util/data_encryption_unittest.cc', ], }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', @@ -3230,7 +3230,7 @@ 'test/data/resource.rc', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', @@ -3378,7 +3378,7 @@ # See comments about "xcode_settings" elsewhere in this file. 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', @@ -3513,7 +3513,7 @@ 'test/perf/url_parse_perftest.cc', ], 'conditions': [ - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', @@ -3669,7 +3669,7 @@ ], # OS=="win" # If you change this condition, make sure you also change it in all.gyp # for the chromium_builder_qa target. - ['OS=="mac" or OS=="win" or (OS=="linux" and target_arch==python_arch)', { + ['OS == "mac" or OS == "win" or (os_posix == 1 and target_arch == python_arch)', { 'targets': [ { # Documentation: http://dev.chromium.org/developers/testing/pyauto @@ -3721,7 +3721,7 @@ 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Wno-error }, 'conditions': [ - ['OS=="linux"', { + ['os_posix == 1 and OS!="mac"', { 'include_dirs': [ '..', '<(sysroot)/usr/include/python<(python_ver)', diff --git a/chrome/common_constants.gypi b/chrome/common_constants.gypi index 8fc435e..eb9c87d 100644 --- a/chrome/common_constants.gypi +++ b/chrome/common_constants.gypi @@ -63,7 +63,7 @@ '../base/base.gyp:base', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': ['../build/linux/system.gyp:gtk'], }], ], diff --git a/chrome/default_plugin/default_plugin.gyp b/chrome/default_plugin/default_plugin.gyp index 247960f..0a53ac1 100644 --- a/chrome/default_plugin/default_plugin.gyp +++ b/chrome/default_plugin/default_plugin.gyp @@ -51,7 +51,7 @@ 'plugin_install_job_monitor.h', ], }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '<(DEPTH)/build/linux/system.gyp:gtk', ], diff --git a/content/content_browser.gypi b/content/content_browser.gypi index c14603a..93d09bd 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -361,7 +361,7 @@ ['OS=="win"', { 'msvs_guid': '639DB58D-32C2-435A-A711-65A12F62E442', }], - ['OS=="linux"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:dbus-glib', # For FcLangSetAdd call in render_sandbox_host_linux.cc diff --git a/content/content_common.gypi b/content/content_common.gypi index 5e237d4..ebc0e25 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -266,12 +266,12 @@ ], }, }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], }], - ['OS=="linux" and target_arch!="arm"', { + ['use_x11 == 1 and target_arch != "arm"', { 'sources': [ 'common/gpu/x_util.cc', 'common/gpu/x_util.h', diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi index 94b4dc80..93c0ca9 100644 --- a/content/content_plugin.gypi +++ b/content/content_plugin.gypi @@ -54,7 +54,7 @@ '<(DEPTH)/third_party/wtl/include', ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 7205199..6798011 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -175,7 +175,7 @@ 'renderer/command_buffer_proxy.h', ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', ], diff --git a/ui/base/strings/ui_strings.gyp b/ui/base/strings/ui_strings.gyp index 257a9da..e33635b 100644 --- a/ui/base/strings/ui_strings.gyp +++ b/ui/base/strings/ui_strings.gyp @@ -40,7 +40,7 @@ }, ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['os_posix == 1 and OS != "mac"', { 'targets': [{ 'target_name': 'ui_unittest_strings', 'type': 'none', diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp index 98adcf8..8a6f66a 100644 --- a/ui/gfx/compositor/compositor.gyp +++ b/ui/gfx/compositor/compositor.gyp @@ -8,12 +8,12 @@ ['exclude', '_(gl|win)\\.(cc?)$'], ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [ - ['include', '_(gl)\\.cc$'], - ]}], - ['OS=="win"', {'sources/': [ - ['include', '_(win)\\.cc$'], - ]}], + ['os_posix == 1 and OS != "mac"', { + 'sources/': [['include', '_(gl)\\.cc$'],] + }], + ['OS == "win"', { + 'sources/': [['include', '_(win)\\.cc$'],] + }], ], }, 'targets': [ @@ -33,7 +33,7 @@ 'compositor_gl.cc', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['os_posix == 1 and OS != "mac"', { 'sources!': [ 'compositor.cc', ], diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp index 83acee4..da520bd 100644 --- a/ui/gfx/gl/gl.gyp +++ b/ui/gfx/gl/gl.gyp @@ -10,7 +10,7 @@ ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'], ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [ + ['toolkit_uses_gtk == 1', {'sources/': [ ['include', '/gtk/'], ['include', '_(gtk|linux|posix|skia|x)\\.cc$'], ['include', '/(gtk|x11)_[^/]*\\.cc$'], @@ -123,7 +123,7 @@ }, ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="win"', { + ['OS != "mac"', { 'sources': [ 'egl_util.cc', 'egl_util.h', @@ -138,7 +138,7 @@ '<(DEPTH)/third_party/angle/include', ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['use_x11 == 1', { 'sources': [ 'gl_context_glx.cc', 'gl_context_glx.h', diff --git a/ui/gfx/surface/surface.gyp b/ui/gfx/surface/surface.gyp index 0cbfe94..19aa1ba 100644 --- a/ui/gfx/surface/surface.gyp +++ b/ui/gfx/surface/surface.gyp @@ -10,11 +10,13 @@ ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'], ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [ - ['include', '/gtk/'], - ['include', '_(gtk|linux|posix|skia|x)\\.cc$'], - ['include', '/(gtk|x11)_[^/]*\\.cc$'], - ]}], + ['toolkit_uses_gtk == 1', { + 'sources/': [ + ['include', '/gtk/'], + ['include', '_(gtk|linux|posix|skia|x)\\.cc$'], + ['include', '/(gtk|x11)_[^/]*\\.cc$'], + ], + }], ['OS=="mac"', {'sources/': [ ['include', '/cocoa/'], ['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'], @@ -14,11 +14,13 @@ ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'], ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [ - ['include', '/gtk/'], - ['include', '_(gtk|linux|posix|skia|x)\\.cc$'], - ['include', '/(gtk|x11)_[^/]*\\.cc$'], - ]}], + ['toolkit_uses_gtk == 1', { + 'sources/': [ + ['include', '/gtk/'], + ['include', '_(gtk|linux|posix|skia|x)\\.cc$'], + ['include', '/(gtk|x11)_[^/]*\\.cc$'], + ], + }], ['OS=="mac"', {'sources/': [ ['include', '/cocoa/'], ['include', '_(cocoa|mac|posix)\\.(cc|mm?)$'], diff --git a/ui/ui_base.gypi b/ui/ui_base.gypi index e9e891e..1f20b43 100644 --- a/ui/ui_base.gypi +++ b/ui/ui_base.gypi @@ -60,7 +60,7 @@ 'base/range/range.mm', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:x11', diff --git a/ui/ui_gfx.gypi b/ui/ui_gfx.gypi index be50592..04c0d88 100644 --- a/ui/ui_gfx.gypi +++ b/ui/ui_gfx.gypi @@ -132,7 +132,7 @@ '../third_party/wtl/include', ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ # font_gtk.cc uses fontconfig. # TODO(evanm): I think this is wrong; it should just use GTK. diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 0c1fce0..aae12d0 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -90,7 +90,7 @@ ], }, }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../app/app.gyp:app_base', '../build/linux/system.gyp:gtk', diff --git a/ui/ui_views.gypi b/ui/ui_views.gypi index e7e54f7..b291bd4 100644 --- a/ui/ui_views.gypi +++ b/ui/ui_views.gypi @@ -60,7 +60,7 @@ '../', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:x11', diff --git a/views/views.gyp b/views/views.gyp index baa9e72..01937a1 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -8,7 +8,7 @@ }, 'conditions': [ - [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['os_posix == 1 and OS != "mac"', { 'conditions': [ ['sysroot!=""', { 'variables': { @@ -29,7 +29,7 @@ ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'], ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [ + ['toolkit_uses_gtk == 1', {'sources/': [ ['include', '/gtk/'], ['include', '_(gtk|linux|posix|skia|x)\\.cc$'], ['include', '/(gtk|x11)_[^/]*\\.cc$'], @@ -398,7 +398,7 @@ '<(DEPTH)/third_party/wtl/include', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:x11', @@ -519,7 +519,7 @@ '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../chrome/chrome.gyp:packed_resources', @@ -607,7 +607,7 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', ], 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../chrome/chrome.gyp:packed_resources', diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 1b1f3df..16b7197 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -445,15 +445,14 @@ # own hard dependencies. 'hard_dependency': 1, 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ '<(DEPTH)/build/linux/system.gyp:gtk', ], 'sources!': [ 'plugins/plugin_stubs.cc', ], - }, { # else: OS!="linux" and OS!="freebsd" and OS!="openbsd" \ - # and OS!="solaris"' + }, { # else: toolkit_uses_gtk != 1 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'], ['exclude', r'/gtk_']], }], diff --git a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp index 7f987bb..4c9e8d2 100644 --- a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp +++ b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp @@ -47,11 +47,11 @@ ], }, }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['os_posix == 1 and OS != "mac"', { 'type': 'shared_library', 'cflags': ['-fvisibility=hidden'], }], - ['OS=="linux" or OS=="openbsd" or OS=="freebsd" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', { + ['os_posix == 1 and OS != "mac" and (target_arch == "x64" or target_arch == "arm") and linux_fpic != 1', { 'product_name': 'pepper_test_plugin', # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'], diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 65cc1c9..82cbdab 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -120,7 +120,7 @@ 'copy_npapi_test_plugin', ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ 'test_shell_resources', '<(DEPTH)/build/linux/system.gyp:gtk', @@ -161,7 +161,7 @@ 'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak', }, 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['os_posix == 1 and OS != "mac"', { 'actions': [ { 'action_name': 'test_shell_repack', @@ -265,7 +265,7 @@ }, }, }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['toolkit_uses_gtk == 1', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -463,7 +463,7 @@ }, }, }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['toolkit_uses_gtk == 1', { 'dependencies': [ 'test_shell_pak', '<(DEPTH)/build/linux/system.gyp:gtk', @@ -505,7 +505,7 @@ '../../../skia/ext/vector_canvas_unittest.cc', ], }], - ['OS=="linux" or OS=="freebsd" or OS=="solaris"', { + ['os_posix == 1 and OS != "mac"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -625,13 +625,13 @@ ], }, }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['os_posix == 1 and OS != "mac"', { 'sources!': [ # Needs simple event record type porting '../../plugins/npapi/test/plugin_windowless_test.cc', ], }], - ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and (target_arch=="x64" or target_arch=="arm")', { + ['os_posix == 1 and OS != "mac" and (target_arch == "x64" or target_arch == "arm")', { # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'] }], @@ -660,7 +660,7 @@ }, ] }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['os_posix == 1 and OS != "mac"', { 'copies': [ { 'destination': '<(PRODUCT_DIR)/plugins', @@ -672,7 +672,7 @@ }, ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['os_posix == 1 and OS != "mac"', { 'targets': [ { 'target_name': 'test_shell_resources', |