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

Side by Side Diff: runtime/bin/bin.gypi

Issue 1831533002: Fix broken dartium build due to invalid dependencies when dart_io_support=0 (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | 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 Dart project authors. Please see the AUTHORS file 1 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 # for details. All rights reserved. Use of this source code is governed by a 2 # for details. All rights reserved. Use of this source code is governed by a
3 # BSD-style license that can be found in the LICENSE file. 3 # BSD-style license that can be found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'gen_source_dir': '<(SHARED_INTERMEDIATE_DIR)', 7 'gen_source_dir': '<(SHARED_INTERMEDIATE_DIR)',
8 8
9 'io_cc_file': '<(gen_source_dir)/io_gen.cc', 9 'io_cc_file': '<(gen_source_dir)/io_gen.cc',
10 'io_patch_cc_file': '<(gen_source_dir)/io_patch_gen.cc', 10 'io_patch_cc_file': '<(gen_source_dir)/io_patch_gen.cc',
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 ], 223 ],
224 'sources/': [ 224 'sources/': [
225 ['exclude', '_test\\.(cc|h)$'], 225 ['exclude', '_test\\.(cc|h)$'],
226 ], 226 ],
227 'conditions': [ 227 'conditions': [
228 ['OS != "mac" and dart_io_support==1 and dart_io_secure_socket==1', { 228 ['OS != "mac" and dart_io_support==1 and dart_io_secure_socket==1', {
229 'dependencies': [ 229 'dependencies': [
230 '../third_party/boringssl/boringssl_dart.gyp:boringssl', 230 '../third_party/boringssl/boringssl_dart.gyp:boringssl',
231 ], 231 ],
232 }], 232 }],
233 ['dart_io_secure_socket==0', { 233 ['dart_io_secure_socket==0 or dart_io_support==0', {
234 'defines': [ 234 'defines': [
235 'DART_IO_SECURE_SOCKET_DISABLED' 235 'DART_IO_SECURE_SOCKET_DISABLED'
236 ], 236 ],
237 }], 237 }],
238 ['OS=="win"', { 238 ['OS=="win"', {
239 'sources/' : [ 239 'sources/' : [
240 ['exclude', 'fdutils.h'], 240 ['exclude', 'fdutils.h'],
241 ], 241 ],
242 # TODO(antonm): fix the implementation. 242 # TODO(antonm): fix the implementation.
243 # Current implementation accepts char* strings 243 # Current implementation accepts char* strings
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 ['dart_io_support==1', { 299 ['dart_io_support==1', {
300 'dependencies': [ 300 'dependencies': [
301 'bin/zlib.gyp:zlib_dart', 301 'bin/zlib.gyp:zlib_dart',
302 ], 302 ],
303 }], 303 }],
304 ['OS != "mac" and dart_io_support==1 and dart_io_secure_socket==1', { 304 ['OS != "mac" and dart_io_support==1 and dart_io_secure_socket==1', {
305 'dependencies': [ 305 'dependencies': [
306 '../third_party/boringssl/boringssl_dart.gyp:boringssl', 306 '../third_party/boringssl/boringssl_dart.gyp:boringssl',
307 ], 307 ],
308 }], 308 }],
309 ['dart_io_secure_socket==0', { 309 ['dart_io_secure_socket==0 or dart_io_support==0', {
310 'defines': [ 310 'defines': [
311 'DART_IO_SECURE_SOCKET_DISABLED' 311 'DART_IO_SECURE_SOCKET_DISABLED'
312 ], 312 ],
313 }], 313 }],
314 ['OS=="win"', { 314 ['OS=="win"', {
315 'link_settings': { 315 'link_settings': {
316 'libraries': [ '-liphlpapi.lib' ], 316 'libraries': [ '-liphlpapi.lib' ],
317 }, 317 },
318 # TODO(antonm): fix the implementation. 318 # TODO(antonm): fix the implementation.
319 # Current implementation accepts char* strings 319 # Current implementation accepts char* strings
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 }], 904 }],
905 ['OS=="linux"', { 905 ['OS=="linux"', {
906 'cflags': [ 906 'cflags': [
907 '-fPIC', 907 '-fPIC',
908 ], 908 ],
909 }], 909 }],
910 ], 910 ],
911 }, 911 },
912 ], 912 ],
913 } 913 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698