diff options
4 files changed, 11 insertions, 11 deletions
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd index 8322236..aaeea52 100644 --- a/webkit/glue/webkit_resources.grd +++ b/webkit/glue/webkit_resources.grd @@ -29,7 +29,7 @@ <include name="IDR_MEDIA_SLIDER_THUMB" file="resources\media_slider_thumb.png" type="BINDATA" /> <include name="IDR_MEDIA_VOLUME_SLIDER_THUMB" file="resources\media_volume_slider_thumb.png" type="BINDATA" /> - <if expr="os == 'linux2' or os == 'freebsd7' or os == 'openbsd4'"> + <if expr="os == 'linux2' or os == 'freebsd7' or os == 'openbsd4' or os == 'sunos5'"> <include name="IDR_LINUX_CHECKBOX_OFF" file="resources\linux-checkbox-off.png" type="BINDATA" /> <include name="IDR_LINUX_CHECKBOX_ON" file="resources\linux-checkbox-on.png" type="BINDATA" /> <include name="IDR_LINUX_CHECKBOX_DISABLED_OFF" file="resources\linux-checkbox-disabled-off.png" type="BINDATA" /> diff --git a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/platform_utils.py b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/platform_utils.py index 03af83d..c89bac8 100644 --- a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/platform_utils.py +++ b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/platform_utils.py @@ -21,5 +21,5 @@ if sys.platform in ('cygwin', 'win32'): from platform_utils_win import * elif sys.platform == 'darwin': from platform_utils_mac import * -elif sys.platform in ('linux', 'linux2', 'freebsd7', 'openbsd4'): +elif sys.platform in ('linux', 'linux2', 'freebsd7', 'openbsd4', 'sunos5'): from platform_utils_linux import * diff --git a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp index afd8ee7..c7320017 100644 --- a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp +++ b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp @@ -45,7 +45,7 @@ ], }, }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 'type': 'shared_library', 'cflags': ['-fvisibility=hidden'], # -gstabs, used in the official builds, causes an ICE. Simply remove diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 57c7864..4ad72ca 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -138,7 +138,7 @@ 'npapi_test_plugin', ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 'dependencies': [ 'test_shell_resources', '<(DEPTH)/build/linux/system.gyp:gtk', @@ -147,7 +147,7 @@ # for: test_shell_gtk.cc 'cflags': ['-Wno-multichar'], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { # See below TODO in the Windows branch. 'copies': [ { @@ -292,7 +292,7 @@ '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -445,7 +445,7 @@ ], 'sources': [ '<@(test_shell_windows_resource_files)' ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 'dependencies': [ 'test_shell_pak', '<(DEPTH)/build/linux/system.gyp:gtk', @@ -481,7 +481,7 @@ '../../../skia/ext/vector_canvas_unittest.cc', ], }], - ['OS=="linux" or OS=="freebsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="solaris"', { 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ @@ -567,7 +567,7 @@ ], }, }], - ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and (target_arch=="x64" or target_arch=="arm")', { + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and (target_arch=="x64" or target_arch=="arm")', { # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'] }], @@ -672,7 +672,7 @@ '../../glue/plugins/test/plugin_windowless_test.cc', ], }], - ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and (target_arch=="x64" or target_arch=="arm")', { + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and (target_arch=="x64" or target_arch=="arm")', { # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'] }], @@ -680,7 +680,7 @@ }, ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 'targets': [ { 'target_name': 'test_shell_resources', |