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

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

Issue 16060004: When cross-compiling, also build and link run_vm_tests for the host architecture. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 6 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
« no previous file with comments | « 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 199075 (this should agree with "nss_rev" in DEPS). 10 # Revision 199075 (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 'toolsets':['host','target'],
27 # Changed by Dart: '<(zlib_directory)/' added to all paths. 28 # Changed by Dart: '<(zlib_directory)/' added to all paths.
28 'sources': [ 29 'sources': [
29 '<(zlib_path)/adler32.c', 30 '<(zlib_path)/adler32.c',
30 '<(zlib_path)/compress.c', 31 '<(zlib_path)/compress.c',
31 '<(zlib_path)/crc32.c', 32 '<(zlib_path)/crc32.c',
32 '<(zlib_path)/crc32.h', 33 '<(zlib_path)/crc32.h',
33 '<(zlib_path)/deflate.c', 34 '<(zlib_path)/deflate.c',
34 '<(zlib_path)/deflate.h', 35 '<(zlib_path)/deflate.h',
35 '<(zlib_path)/gzclose.c', 36 '<(zlib_path)/gzclose.c',
36 '<(zlib_path)/gzguts.h', 37 '<(zlib_path)/gzguts.h',
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 'cflags': [ 123 'cflags': [
123 '-Wno-parentheses-equality', 124 '-Wno-parentheses-equality',
124 ], 125 ],
125 }], 126 }],
126 ], 127 ],
127 }, 128 },
128 # Changed by Dart: Omit target 'zip' 129 # Changed by Dart: Omit target 'zip'
129 ], 130 ],
130 }]], 131 }]],
131 } 132 }
OLDNEW
« no previous file with comments | « runtime/bin/net/ssl.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698