diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 16:03:54 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 16:03:54 +0000 |
| commit | 5164511c16906702c8822aaec2641f66f8f3bc9e (patch) | |
| tree | d95a66cfaec13d4962b4a4948c73fd4b8a211029 /third_party/libpng/libpng.gyp | |
| parent | c85850fd649307bc7a622bfd76c8b5d51b1975f4 (diff) | |
| download | chromium_src-5164511c16906702c8822aaec2641f66f8f3bc9e.zip chromium_src-5164511c16906702c8822aaec2641f66f8f3bc9e.tar.gz chromium_src-5164511c16906702c8822aaec2641f66f8f3bc9e.tar.bz2 | |
Default to building instead of just linking libpng for Android
Right now, the default defined in libpng.gyp is to use the system's
libpng for Android, while we want to build this from source.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8486008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng/libpng.gyp')
| -rw-r--r-- | third_party/libpng/libpng.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 1366579..5325310 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -5,7 +5,7 @@ { 'variables': { 'conditions': [ - [ 'os_posix == 1 and OS != "mac"', { + [ 'os_posix == 1 and OS != "mac" and OS != "android"', { # Link to system .so since we already use it due to GTK. 'use_system_libpng%': 1, }, { # os_posix != 1 or OS == "mac" |