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

Side by Side Diff: third_party/zlib/zlib.gyp

Issue 8987002: define USE_FILE32API on Android too (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 [ 'os_posix == 1 and OS != "mac" and OS != "openbsd"', { 8 [ 'os_posix == 1 and OS != "mac" and OS != "openbsd"', {
9 # Link to system .so since we already use it due to GTK. 9 # Link to system .so since we already use it due to GTK.
10 # TODO(pvalchev): OpenBSD is purposefully left out, as the system 10 # TODO(pvalchev): OpenBSD is purposefully left out, as the system
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 '.', 64 '.',
65 ], 65 ],
66 }, 66 },
67 'conditions': [ 67 'conditions': [
68 ['OS!="win"', { 68 ['OS!="win"', {
69 'product_name': 'chrome_zlib', 69 'product_name': 'chrome_zlib',
70 'sources!': [ 70 'sources!': [
71 'contrib/minizip/iowin32.c' 71 'contrib/minizip/iowin32.c'
72 ], 72 ],
73 }], 73 }],
74 ['OS=="mac" or os_bsd==1', { 74 ['OS=="mac" or os_bsd==1 or OS=="android"', {
75 # Mac and the BSDs don't have fopen64, ftello64, or fseeko64. 75 # Mac, Android and the BSDs don't have fopen64, ftello64, or
76 # We use fopen, ftell, and fseek instead on these systems. 76 # fseeko64. We use fopen, ftell, and fseek instead on these
77 # systems.
77 'defines': [ 78 'defines': [
78 'USE_FILE32API' 79 'USE_FILE32API'
79 ], 80 ],
80 }], 81 }],
81 ], 82 ],
82 }, 83 },
83 ], 84 ],
84 }, { 85 }, {
85 'targets': [ 86 'targets': [
86 { 87 {
87 'target_name': 'zlib', 88 'target_name': 'zlib',
88 'type': 'static_library', 89 'type': 'static_library',
89 'direct_dependent_settings': { 90 'direct_dependent_settings': {
90 'defines': [ 91 'defines': [
91 'USE_SYSTEM_ZLIB', 92 'USE_SYSTEM_ZLIB',
92 ], 93 ],
93 }, 94 },
94 'defines': [ 95 'defines': [
95 'USE_SYSTEM_ZLIB', 96 'USE_SYSTEM_ZLIB',
96 ], 97 ],
97 'sources': [ 98 'sources': [
98 'contrib/minizip/ioapi.c', 99 'contrib/minizip/ioapi.c',
99 'contrib/minizip/ioapi.h', 100 'contrib/minizip/ioapi.h',
100 'contrib/minizip/unzip.c', 101 'contrib/minizip/unzip.c',
101 'contrib/minizip/unzip.h', 102 'contrib/minizip/unzip.h',
102 'contrib/minizip/zip.c', 103 'contrib/minizip/zip.c',
103 'contrib/minizip/zip.h', 104 'contrib/minizip/zip.h',
104 ], 105 ],
105 'conditions': [ 106 'conditions': [
107 ['OS=="mac" or os_bsd==1 or OS=="android"', {
108 # Mac, Android and the BSDs don't have fopen64, ftello64, or
109 # fseeko64. We use fopen, ftell, and fseek instead on these
110 # systems.
111 'defines': [
112 'USE_FILE32API'
113 ],
114 }],
106 ['OS=="android"', { 115 ['OS=="android"', {
107 'toolsets': ['target', 'host'], 116 'toolsets': ['target', 'host'],
108 }], 117 }],
109 ], 118 ],
110 'link_settings': { 119 'link_settings': {
111 'libraries': [ 120 'libraries': [
112 '-lz', 121 '-lz',
113 ], 122 ],
114 }, 123 },
115 }, 124 },
116 ], 125 ],
117 }], 126 }],
118 ], 127 ],
119 } 128 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698