diff options
| author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 23:39:44 +0000 |
|---|---|---|
| committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 23:39:44 +0000 |
| commit | 7e1f5e02e91002563a90c031999face8db78ee3c (patch) | |
| tree | d54acff7d4c83e9571da3878383f35f1de5b70be /third_party/libpng/libpng.gyp | |
| parent | f2d5ff0926f44cdfe39ff9d14e30f5101005dc43 (diff) | |
| download | chromium_src-7e1f5e02e91002563a90c031999face8db78ee3c.zip chromium_src-7e1f5e02e91002563a90c031999face8db78ee3c.tar.gz chromium_src-7e1f5e02e91002563a90c031999face8db78ee3c.tar.bz2 | |
Revert 121044 - 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.
Reverting due to compile errors on Linux:
http://chromegw.corp.google.com/i/chromium/builders/Linux%20Builder%20%28dbg%29%28shared%29/builds/17665/steps/compile/logs/stdio
BUG=112822
Review URL: http://codereview.chromium.org/9365007
TBR=cevans@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9374001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng/libpng.gyp')
| -rw-r--r-- | third_party/libpng/libpng.gyp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index beccefe..5325310 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -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, }], |