diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 15:56:00 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 15:56:00 +0000 |
| commit | 4fde1e143874896d5d75cfc6416876cd6cc4a830 (patch) | |
| tree | d31ab10e9e4c3e5b6b1cbd3334b6b55969fd7b87 /build/common.gypi | |
| parent | 48cfa952c12897ad38578259238c158042c287a0 (diff) | |
| download | chromium_src-4fde1e143874896d5d75cfc6416876cd6cc4a830.zip chromium_src-4fde1e143874896d5d75cfc6416876cd6cc4a830.tar.gz chromium_src-4fde1e143874896d5d75cfc6416876cd6cc4a830.tar.bz2 | |
Android: configure use_system_zlib in zlib.gyp
Currently third_party/zlib/zlib.gyp uses the system libz if:
os_posix == 1 and OS != "mac" and OS != "ios" and OS != "openbsd"
I'm assuming that Android sets os_posix==1 and therefore this change is
a no-op. But it consolidates control of this variable in a single
location.
BUG=none
https://chromiumcodereview.appspot.com/10837100/
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 4b6cd7e..3f64fa9 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -987,9 +987,6 @@ 'use_system_skia%': '0', 'use_system_harfbuzz%': '0', - # Always use the system zlib. - 'use_system_zlib%': 1, - # Configure crash reporting and build options based on release type. 'conditions': [ ['buildtype=="Official"', { |