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

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

Issue 11377098: Change gyp flag from in_dartium to dart_io_support. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Remove intermediate nss_runtime target, and redundant dependencies. 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
« no previous file with comments | « no previous file | runtime/bin/net/nss.gyp » ('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 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 'crypto_cc_file': '<(SHARED_INTERMEDIATE_DIR)/crypto_gen.cc', 7 'crypto_cc_file': '<(SHARED_INTERMEDIATE_DIR)/crypto_gen.cc',
8 'io_cc_file': '<(SHARED_INTERMEDIATE_DIR)/io_gen.cc', 8 'io_cc_file': '<(SHARED_INTERMEDIATE_DIR)/io_gen.cc',
9 'io_patch_cc_file': '<(SHARED_INTERMEDIATE_DIR)/io_patch_gen.cc', 9 'io_patch_cc_file': '<(SHARED_INTERMEDIATE_DIR)/io_patch_gen.cc',
10 'json_cc_file': '<(SHARED_INTERMEDIATE_DIR)/json_gen.cc', 10 'json_cc_file': '<(SHARED_INTERMEDIATE_DIR)/json_gen.cc',
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 'libraries': [ 299 'libraries': [
300 '-ldl', 300 '-ldl',
301 ], 301 ],
302 }, 302 },
303 }], 303 }],
304 ], 304 ],
305 }, 305 },
306 { 306 {
307 'target_name': 'libdart_io', 307 'target_name': 'libdart_io',
308 'type': 'static_library', 308 'type': 'static_library',
309 'dependencies': [
310 'nss_runtime',
311 ],
312 'include_dirs': [ 309 'include_dirs': [
313 '..', 310 '..',
314 ], 311 ],
315 'sources': [ 312 'sources': [
316 'io_natives.h', 313 'io_natives.h',
317 'io_natives.cc', 314 'io_natives.cc',
318 ], 315 ],
319 'includes': [ 316 'includes': [
320 'io_impl_sources.gypi', 317 'io_impl_sources.gypi',
321 ], 318 ],
322 'conditions': [ 319 'conditions': [
320 [ 'dart_io_support==1', {
321 'dependencies': [
322 'bin/net/ssl.gyp:libssl_dart',
323 ],
324 }],
323 ['OS=="win"', { 325 ['OS=="win"', {
324 # TODO(antonm): fix the implementation. 326 # TODO(antonm): fix the implementation.
325 # Current implementation accepts char* strings 327 # Current implementation accepts char* strings
326 # and therefore fails to compile once _UNICODE is 328 # and therefore fails to compile once _UNICODE is
327 # enabled. That should be addressed using -A 329 # enabled. That should be addressed using -A
328 # versions of functions and adding necessary conversions. 330 # versions of functions and adding necessary conversions.
329 'configurations': { 331 'configurations': {
330 'Common_Base': { 332 'Common_Base': {
331 'msvs_configuration_attributes': { 333 'msvs_configuration_attributes': {
332 'CharacterSet': '0', 334 'CharacterSet': '0',
333 }, 335 },
334 }, 336 },
335 }, 337 },
336 }], 338 }],
337 ], 339 ],
338 }, 340 },
339 { 341 {
340 'target_name': 'nss_runtime',
341 'type': 'none',
342 'conditions': [[ 'in_dartium==0', {
343 'dependencies': [
344 'bin/net/nss.gyp:nss_dart',
345 'bin/net/nss.gyp:nspr_dart',
346 'bin/net/nss.gyp:nssckbi_dart',
347 'bin/net/nss.gyp:nss_static_dart',
348 'bin/net/ssl.gyp:libssl_dart',
349 'bin/net/zlib.gyp:zlib_dart',
350 'bin/net/sqlite.gyp:sqlite_dart',
351 ],
352 'export_dependent_settings': [
353 'bin/net/nss.gyp:nss_dart',
354 'bin/net/nss.gyp:nspr_dart',
355 'bin/net/nss.gyp:nssckbi_dart',
356 'bin/net/nss.gyp:nss_static_dart',
357 'bin/net/ssl.gyp:libssl_dart',
358 'bin/net/zlib.gyp:zlib_dart',
359 'bin/net/sqlite.gyp:sqlite_dart',
360 ],
361 }]],
362 },
363 {
364 'target_name': 'libdart_withcore', 342 'target_name': 'libdart_withcore',
365 'type': 'static_library', 343 'type': 'static_library',
366 'dependencies': [ 344 'dependencies': [
367 'libdart_lib_withcore', 345 'libdart_lib_withcore',
368 'libdart_vm', 346 'libdart_vm',
369 'libjscre', 347 'libjscre',
370 'libdouble_conversion', 348 'libdouble_conversion',
371 'generate_version_cc_file', 349 'generate_version_cc_file',
372 ], 350 ],
373 'include_dirs': [ 351 'include_dirs': [
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 ['OS=="mac"', { 608 ['OS=="mac"', {
631 'xcode_settings': { 609 'xcode_settings': {
632 'OTHER_LDFLAGS': [ '-undefined', 'dynamic_lookup' ], 610 'OTHER_LDFLAGS': [ '-undefined', 'dynamic_lookup' ],
633 }, 611 },
634 }], 612 }],
635 ], 613 ],
636 }, 614 },
637 ], 615 ],
638 } 616 }
639 617
OLDNEW
« no previous file with comments | « no previous file | runtime/bin/net/nss.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698