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

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

Issue 201853003: Update NSS to NSS 3.16 RTM (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
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 232552 (this should agree with "nss_rev" in DEPS). 10 # Revision 257452 (this should agree with "nss_rev" in DEPS).
11 { 11 {
12 # Added by Dart. All Dart comments refer to the following block or line. 12 # Added by Dart. All Dart comments refer to the following block or line.
13 'includes': [ 13 'includes': [
14 '../../tools/gyp/runtime-configurations.gypi', 14 '../../tools/gyp/runtime-configurations.gypi',
15 '../../tools/gyp/nss_configurations.gypi', 15 '../../tools/gyp/nss_configurations.gypi',
16 ], 16 ],
17 'variables': { 17 'variables': {
18 # Added by Dart. 18 # Added by Dart.
19 'zlib_path': '../../../third_party/zlib', 19 'zlib_path': '../../../third_party/zlib',
20 }, 20 },
21 # Added by Dart. We do not indent, so diffs with the original are clearer. 21 # Added by Dart. We do not indent, so diffs with the original are clearer.
22 'conditions': [[ 'dart_io_support==1', { 22 'conditions': [[ 'dart_io_support==1', {
23 'targets': [ 23 'targets': [
24 { 24 {
25 'target_name': 'zlib_dart', # Added by Dart (the _dart postfix) 25 'target_name': 'zlib_dart', # Added by Dart (the _dart postfix)
26 'type': 'static_library', 26 'type': 'static_library',
27 # Added by Dart (the original only has this on android).
27 'toolsets':['host','target'], 28 'toolsets':['host','target'],
28 # Changed by Dart: '<(zlib_directory)/' added to all paths. 29 # Changed by Dart: '<(zlib_directory)/' added to all paths.
29 'sources': [ 30 'sources': [
30 '<(zlib_path)/adler32.c', 31 '<(zlib_path)/adler32.c',
31 '<(zlib_path)/compress.c', 32 '<(zlib_path)/compress.c',
32 '<(zlib_path)/crc32.c', 33 '<(zlib_path)/crc32.c',
33 '<(zlib_path)/crc32.h', 34 '<(zlib_path)/crc32.h',
34 '<(zlib_path)/deflate.c', 35 '<(zlib_path)/deflate.c',
35 '<(zlib_path)/deflate.h', 36 '<(zlib_path)/deflate.h',
36 '<(zlib_path)/gzclose.c', 37 '<(zlib_path)/gzclose.c',
(...skipping 28 matching lines...) Expand all
65 }, 66 },
66 'conditions': [ 67 'conditions': [
67 ['OS!="win"', { 68 ['OS!="win"', {
68 'product_name': 'chrome_zlib', 69 'product_name': 'chrome_zlib',
69 }], 70 }],
70 ], 71 ],
71 }, 72 },
72 ], 73 ],
73 }]], 74 }]],
74 } 75 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698