diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 20:42:00 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-02 20:42:00 +0000 |
| commit | 2ddfd559e6889f8c029a7c499b4cbe360d55c9a5 (patch) | |
| tree | 24b6a3a5760b7654a63031d3d0cd070400e9c562 /third_party/zlib | |
| parent | 37a71cd82bf9575d580b24a0b32d181c0404b532 (diff) | |
| download | chromium_src-2ddfd559e6889f8c029a7c499b4cbe360d55c9a5.zip chromium_src-2ddfd559e6889f8c029a7c499b4cbe360d55c9a5.tar.gz chromium_src-2ddfd559e6889f8c029a7c499b4cbe360d55c9a5.tar.bz2 | |
Add iOS support to ssl.gyp and zlib.gyp
Nothing builds these targets yet, but getting these working makes it easier to get all.gyp working for iOS.
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10692060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
| -rw-r--r-- | third_party/zlib/zlib.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp index 4215f62..5e4c200 100644 --- a/third_party/zlib/zlib.gyp +++ b/third_party/zlib/zlib.gyp @@ -5,12 +5,12 @@ { 'variables': { 'conditions': [ - [ 'os_posix == 1 and OS != "mac" and OS != "openbsd"', { + [ 'os_posix == 1 and OS != "mac" and OS != "ios" and OS != "openbsd"', { # Link to system .so since we already use it due to GTK. # TODO(pvalchev): OpenBSD is purposefully left out, as the system # zlib brings up an incompatibility that breaks rendering. 'use_system_zlib%': 1, - }, { # os_posix != 1 or OS == "mac" or OS == "openbsd" + }, { # os_posix != 1 or OS == "mac" or OS == "ios" or OS == "openbsd" 'use_system_zlib%': 0, }], ], @@ -100,7 +100,7 @@ ], }, }], - ['OS=="mac" or os_bsd==1 or OS=="android"', { + ['OS=="mac" or OS=="ios" or os_bsd==1 or OS=="android"', { # Mac, Android and the BSDs don't have fopen64, ftello64, or # fseeko64. We use fopen, ftell, and fseek instead on these # systems. |