diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 21:50:22 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 21:50:22 +0000 |
| commit | 8166697d6be361f49bbed63528aadd32e43e9b97 (patch) | |
| tree | dc4533fdd81970f126f126fbbc3fb3393fc770fc /third_party | |
| parent | d05555d910fe94d1de169917b6ed62d3df7267ec (diff) | |
| download | chromium_src-8166697d6be361f49bbed63528aadd32e43e9b97.zip chromium_src-8166697d6be361f49bbed63528aadd32e43e9b97.tar.gz chromium_src-8166697d6be361f49bbed63528aadd32e43e9b97.tar.bz2 | |
Revert 121495 - Merge 121199 - Don't use system libpng by default. It causes security maintenance problems
for ChromeOS. It's worth noting that we also don't use the system library
for many other important components such as libxml.
BUG=112822
R=wad,abarth
Review URL: https://chromiumcodereview.appspot.com/9365007
TBR=cevans@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9385012
TBR=cevans@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9378023
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@121550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libpng/libpng.gyp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 978877e..5325310 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -6,9 +6,8 @@ 'variables': { 'conditions': [ [ 'os_posix == 1 and OS != "mac" and OS != "android"', { - # Maybe link to system .so once the security concerns are thought - # through, since we already use it due to GTK. - 'use_system_libpng%': 0, + # Link to system .so since we already use it due to GTK. + 'use_system_libpng%': 1, }, { # os_posix != 1 or OS == "mac" 'use_system_libpng%': 0, }], |