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

Side by Side Diff: runtime/bin/net/zlib.gyp

Issue 11365165: Change names of all NSS gyp targets, so they don't conflict with the Chromium target names. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 1 month 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
« runtime/bin/bin.gypi ('K') | « runtime/bin/net/ssl.gyp ('k') | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 5 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
6 # for details. All rights reserved. Use of this source code is governed by a 6 # for details. All rights reserved. Use of this source code is governed by a
7 # BSD-style license that can be found in the LICENSE file. 7 # BSD-style license that can be found in the LICENSE file.
8 8
9 # This file is a modified copy of src/third_party/zlib/zlib.gyp from Chromium. 9 # This file is a modified copy of src/third_party/zlib/zlib.gyp from Chromium.
10 # Revision 165464 (this should agree with "nss_rev" in DEPS). 10 # Revision 165464 (this should agree with "nss_rev" in DEPS).
(...skipping 13 matching lines...) Expand all
24 # zlib brings up an incompatibility that breaks rendering. 24 # zlib brings up an incompatibility that breaks rendering.
25 'use_system_zlib%': 1, 25 'use_system_zlib%': 1,
26 }, { 26 }, {
27 'use_system_zlib%': 0, 27 'use_system_zlib%': 0,
28 }], 28 }],
29 ], 29 ],
30 'use_system_minizip%': 0, 30 'use_system_minizip%': 0,
31 }, 31 },
32 'targets': [ 32 'targets': [
33 { 33 {
34 'target_name': 'zlib', 34 'target_name': 'zlib_dart',
35 'type': 'static_library', 35 'type': 'static_library',
36 'conditions': [ 36 'conditions': [
37 ['use_system_zlib==0', { 37 ['use_system_zlib==0', {
38 # Changed by Dart: '<(zlib_directory)/' added to all paths. 38 # Changed by Dart: '<(zlib_directory)/' added to all paths.
39 'sources': [ 39 'sources': [
40 '<(zlib_path)/adler32.c', 40 '<(zlib_path)/adler32.c',
41 '<(zlib_path)/compress.c', 41 '<(zlib_path)/compress.c',
42 '<(zlib_path)/crc32.c', 42 '<(zlib_path)/crc32.c',
43 '<(zlib_path)/crc32.h', 43 '<(zlib_path)/crc32.h',
44 '<(zlib_path)/deflate.c', 44 '<(zlib_path)/deflate.c',
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 ], 87 ],
88 'link_settings': { 88 'link_settings': {
89 'libraries': [ 89 'libraries': [
90 '-lz', 90 '-lz',
91 ], 91 ],
92 }, 92 },
93 }], 93 }],
94 ], 94 ],
95 }, 95 },
96 { 96 {
97 'target_name': 'minizip', 97 'target_name': 'minizip_dart',
98 'type': 'static_library', 98 'type': 'static_library',
99 'conditions': [ 99 'conditions': [
100 ['use_system_minizip==0', { 100 ['use_system_minizip==0', {
101 'sources': [ 101 'sources': [
102 '<(zlib_path)/contrib/minizip/ioapi.c', 102 '<(zlib_path)/contrib/minizip/ioapi.c',
103 '<(zlib_path)/contrib/minizip/ioapi.h', 103 '<(zlib_path)/contrib/minizip/ioapi.h',
104 '<(zlib_path)/contrib/minizip/iowin32.c', 104 '<(zlib_path)/contrib/minizip/iowin32.c',
105 '<(zlib_path)/contrib/minizip/iowin32.h', 105 '<(zlib_path)/contrib/minizip/iowin32.h',
106 '<(zlib_path)/contrib/minizip/unzip.c', 106 '<(zlib_path)/contrib/minizip/unzip.c',
107 '<(zlib_path)/contrib/minizip/unzip.h', 107 '<(zlib_path)/contrib/minizip/unzip.h',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 ], 158 ],
159 }, 159 },
160 'cflags': [ 160 'cflags': [
161 '-Wno-parentheses-equality', 161 '-Wno-parentheses-equality',
162 ], 162 ],
163 }], 163 }],
164 ], 164 ],
165 } 165 }
166 ], 166 ],
167 } 167 }
OLDNEW
« runtime/bin/bin.gypi ('K') | « runtime/bin/net/ssl.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698