Commit 4fde1e14 authored by agl@chromium.org's avatar agl@chromium.org

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
parent 48cfa952
...@@ -987,9 +987,6 @@ ...@@ -987,9 +987,6 @@
'use_system_skia%': '0', 'use_system_skia%': '0',
'use_system_harfbuzz%': '0', 'use_system_harfbuzz%': '0',
# Always use the system zlib.
'use_system_zlib%': 1,
# Configure crash reporting and build options based on release type. # Configure crash reporting and build options based on release type.
'conditions': [ 'conditions': [
['buildtype=="Official"', { ['buildtype=="Official"', {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment