diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 22:06:54 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 22:06:54 +0000 |
| commit | 6a654d45598c2631f0009101a553fd14b866b62f (patch) | |
| tree | afd71c88f45b680bf30040047075fe259d5c767c /ppapi | |
| parent | fcc2d5f0e4ff841a6af7cc7f5834985f833cf935 (diff) | |
| download | chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.zip chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.tar.gz chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.tar.bz2 | |
Final gyp patch to make use of the new cross-platform POSIX defines toolkit_uses_gtk, os_posix, and use_x11. For lists of source files that use a mix of POSIX and Gtk APIs, toolkit_uses_gtk was given precedence. Solaris was made to use ALSA also, as libasound has been ported to FreeBSD and Solaris as a wrapper around the native OSS.
Review URL: http://codereview.chromium.org/7055003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/ppapi.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_tests.gypi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp index 8d1d6c0..f1eb48f 100644 --- a/ppapi/ppapi.gyp +++ b/ppapi/ppapi.gyp @@ -17,7 +17,7 @@ # TODO(ajwong): For internal pepper plugins, which are statically linked # into chrome, do we want to build w/o -fPIC? If so, how can we express # that in the build system? - ['OS=="linux" or OS=="openbsd" or OS=="freebsd" or OS=="solaris"', { + ['os_posix == 1 and OS != "mac"', { 'cflags': ['-fPIC', '-fvisibility=hidden'], # This is needed to make the Linux shlib build happy. Without this, diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index dc1d767..ec83d41 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -31,7 +31,7 @@ ], }, }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { + ['os_posix == 1 and OS != "mac"', { 'product_name': 'ppapi_example', 'type': 'shared_library', 'cflags': ['-fvisibility=hidden'], |