Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(775)

Unified Diff: third_party/zlib/zlib.gyp

Issue 10692060: Add iOS support to ssl.gyp and zlib.gyp (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/third_party/nss/ssl.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/zlib.gyp
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 4215f624fa471b2f6560b2a82d89f4665d87d5ed..5e4c2000c2039d24b1c612e12fbdab7a43e9e2f8 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.
« no previous file with comments | « net/third_party/nss/ssl.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698