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

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

Issue 1682783002: Dartium 45 roll (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: removed Created 4 years, 10 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
« no previous file with comments | « runtime/bin/bin.gypi ('k') | tools/dartium/archive.py » ('j') | 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 9 # This file is a modified copy of
10 # https://chromium.googlesource.com/chromium/src/third_party/zlib/zlib.gyp 10 # https://chromium.googlesource.com/chromium/src/third_party/zlib/zlib.gyp
11 # at revision c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f. 11 # at revision c3d0a6190f2f8c924a05ab6cc97b8f975bddd33f.
12 { 12 {
13 # Added by Dart. All Dart comments refer to the following block or line. 13 # Added by Dart. All Dart comments refer to the following block or line.
14 'includes': [ 14 'includes': [
15 '../tools/gyp/runtime-configurations.gypi', 15 '../tools/gyp/runtime-configurations.gypi',
16 '../tools/gyp/nss_configurations.gypi', 16 '../tools/gyp/nss_configurations.gypi',
17 ], 17 ],
18 'variables': { 18 'variables': {
19 # Added by Dart. 19 # Added by Dart.
20 'zlib_path': '../../third_party/zlib', 20 'zlib_path': '../../third_party/zlib',
21 }, 21 },
22 # Added by Dart. We do not indent, so diffs with the original are clearer. 22 # Added by Dart. We do not indent, so diffs with the original are clearer.
23 'conditions': [[ 'dart_io_support==1', {
24 'targets': [ 23 'targets': [
25 { 24 {
26 'target_name': 'zlib_dart', # Added by Dart (the _dart postfix) 25 'target_name': 'zlib_dart', # Added by Dart (the _dart postfix)
27 'type': 'static_library', 26 'type': 'static_library',
28 # Added by Dart (the original only has this on android). 27 # Added by Dart (the original only has this on android).
29 'toolsets':['host','target'], 28 'toolsets':['host','target'],
30 # Changed by Dart: '<(zlib_directory)/' added to all paths. 29 # Changed by Dart: '<(zlib_directory)/' added to all paths.
31 'sources': [ 30 'sources': [
32 '<(zlib_path)/adler32.c', 31 '<(zlib_path)/adler32.c',
33 '<(zlib_path)/compress.c', 32 '<(zlib_path)/compress.c',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 '<(zlib_path)/.', 64 '<(zlib_path)/.',
66 ], 65 ],
67 }, 66 },
68 'conditions': [ 67 'conditions': [
69 ['OS!="win"', { 68 ['OS!="win"', {
70 'product_name': 'chrome_zlib', 69 'product_name': 'chrome_zlib',
71 }], 70 }],
72 ], 71 ],
73 }, 72 },
74 ], 73 ],
75 }]],
76 } 74 }
OLDNEW
« no previous file with comments | « runtime/bin/bin.gypi ('k') | tools/dartium/archive.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698