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

Unified Diff: runtime/bin/net/zlib.gyp

Issue 105223002: Simplifies standalone VM Android build. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/bin.gypi ('k') | runtime/tools/gyp/nss_configurations.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/net/zlib.gyp
===================================================================
--- runtime/bin/net/zlib.gyp (revision 31337)
+++ runtime/bin/net/zlib.gyp (working copy)
@@ -66,66 +66,9 @@
'conditions': [
['OS!="win"', {
'product_name': 'chrome_zlib',
- }], ['OS=="android"', {
- 'toolsets': ['target', 'host'],
}],
],
},
- {
- 'target_name': 'minizip_dart', # Added by Dart (the _dart postfix)
- 'type': 'static_library',
- 'sources': [
- '<(zlib_path)/contrib/minizip/ioapi.c',
- '<(zlib_path)/contrib/minizip/ioapi.h',
- '<(zlib_path)/contrib/minizip/iowin32.c',
- '<(zlib_path)/contrib/minizip/iowin32.h',
- '<(zlib_path)/contrib/minizip/unzip.c',
- '<(zlib_path)/contrib/minizip/unzip.h',
- '<(zlib_path)/contrib/minizip/zip.c',
- '<(zlib_path)/contrib/minizip/zip.h',
- ],
- 'dependencies': [
- 'zlib_dart',
- ],
- 'include_dirs': [
- '<(zlib_path)/.',
- '<(zlib_path)/../..',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(zlib_path)/.',
- ],
- },
- 'conditions': [
- ['OS!="win"', {
- 'sources!': [
- '<(zlib_path)/contrib/minizip/iowin32.c'
- ],
- }],
- ['OS=="android"', {
- 'toolsets': ['target', 'host'],
- }],
- ['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.
- 'defines': [
- 'USE_FILE32API'
- ],
- }],
- ['clang==1', {
- 'xcode_settings': {
- 'WARNING_CFLAGS': [
- # zlib uses `if ((a == b))` for some reason.
- '-Wno-parentheses-equality',
- ],
- },
- 'cflags': [
- '-Wno-parentheses-equality',
- ],
- }],
- ],
- },
],
}]],
}
« no previous file with comments | « runtime/bin/bin.gypi ('k') | runtime/tools/gyp/nss_configurations.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698