diff options
| author | jnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 13:29:35 +0000 |
|---|---|---|
| committer | jnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 13:29:35 +0000 |
| commit | 2421e871afc89c52c00940cb8d90438bb6c4e6e9 (patch) | |
| tree | e3f69fa08c9c5c932cf970cbdd1105bb284887e1 /third_party/zlib | |
| parent | a48871ae8c522cda66db290046e4a360a5cb3c84 (diff) | |
| download | chromium_src-2421e871afc89c52c00940cb8d90438bb6c4e6e9.zip chromium_src-2421e871afc89c52c00940cb8d90438bb6c4e6e9.tar.gz chromium_src-2421e871afc89c52c00940cb8d90438bb6c4e6e9.tar.bz2 | |
define USE_FILE32API on Android too
BUG=
TEST=compile
Review URL: http://codereview.chromium.org/8987002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
| -rw-r--r-- | third_party/zlib/zlib.gyp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp index edd0725..62d7ba0 100644 --- a/third_party/zlib/zlib.gyp +++ b/third_party/zlib/zlib.gyp @@ -71,9 +71,10 @@ 'contrib/minizip/iowin32.c' ], }], - ['OS=="mac" or os_bsd==1', { - # Mac and the BSDs don't have fopen64, ftello64, or fseeko64. - # We use fopen, ftell, and fseek instead on these systems. + ['OS=="mac" 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. 'defines': [ 'USE_FILE32API' ], @@ -103,6 +104,14 @@ 'contrib/minizip/zip.h', ], 'conditions': [ + ['OS=="mac" 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. + 'defines': [ + 'USE_FILE32API' + ], + }], ['OS=="android"', { 'toolsets': ['target', 'host'], }], |