diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 07:08:43 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 07:08:43 +0000 |
| commit | 7aa373836120bf3acb24067ffce4bec21aba19a2 (patch) | |
| tree | eaf96f79f567cdd7a001f0c647437e2825e10b59 | |
| parent | e8eca14305655e9f90f48c2d22c01404031d4176 (diff) | |
| download | chromium_src-7aa373836120bf3acb24067ffce4bec21aba19a2.zip chromium_src-7aa373836120bf3acb24067ffce4bec21aba19a2.tar.gz chromium_src-7aa373836120bf3acb24067ffce4bec21aba19a2.tar.bz2 | |
Only build Chromium (non-system) libpng as a shared_library on Windows component builds. On all other platforms, build it as a static_library.
BUG=none
TEST=it compiles on linux shared bots
Review URL: https://chromiumcodereview.appspot.com/9370014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121206 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | third_party/libpng/libpng.gyp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 978877e..c6ca72e 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -19,7 +19,6 @@ 'targets': [ { 'target_name': 'libpng', - 'type': '<(component)', 'dependencies': [ '../zlib/zlib.gyp:zlib', ], @@ -63,6 +62,13 @@ ], 'conditions': [ ['OS!="win"', {'product_name': 'png'}], + ['OS=="win"', { + 'type': '<(component)', + }, { + # Chromium libpng does not support building as a shared_library + # on non-Windows platforms. + 'type': 'static_library', + }], ['OS=="win" and component=="shared_library"', { 'defines': [ 'PNG_BUILD_DLL', |