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

Side by Side Diff: runtime/bin/net/nss.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/bin.gypi ('k') | runtime/bin/net/sqlite.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 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 Chromium's deps/third_party/nss/nss.gyp. 9 # This file is a modified copy of Chromium's deps/third_party/nss/nss.gyp.
10 # Revision 199075 (this should agree with "nss_rev" in DEPS). 10 # Revision 199075 (this should agree with "nss_rev" in DEPS).
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 }], 84 }],
85 ], 85 ],
86 }, 86 },
87 # Added by Dart. We do not indent, so diffs with the original are clearer. 87 # Added by Dart. We do not indent, so diffs with the original are clearer.
88 'conditions': [[ 'dart_io_support==1', { 88 'conditions': [[ 'dart_io_support==1', {
89 'targets': [ 89 'targets': [
90 { 90 {
91 'target_name': 'nspr_dart', # Added by Dart (the _dart postfix) 91 'target_name': 'nspr_dart', # Added by Dart (the _dart postfix)
92 'product_name': 'crnspr', 92 'product_name': 'crnspr',
93 'type': '<(component)', 93 'type': '<(component)',
94 'toolsets':['host','target'],
94 # Changed by Dart: '<(nss_directory)/' added to all paths. 95 # Changed by Dart: '<(nss_directory)/' added to all paths.
95 'sources': [ 96 'sources': [
96 # Added by Dart. 97 # Added by Dart.
97 'os_linux.S', 98 'os_linux.S',
98 '<(nss_directory)/nspr/lib/ds/plarena.c', 99 '<(nss_directory)/nspr/lib/ds/plarena.c',
99 '<(nss_directory)/nspr/lib/ds/plarena.h', 100 '<(nss_directory)/nspr/lib/ds/plarena.h',
100 '<(nss_directory)/nspr/lib/ds/plarenas.h', 101 '<(nss_directory)/nspr/lib/ds/plarenas.h',
101 '<(nss_directory)/nspr/lib/ds/plhash.c', 102 '<(nss_directory)/nspr/lib/ds/plhash.c',
102 '<(nss_directory)/nspr/lib/ds/plhash.h', 103 '<(nss_directory)/nspr/lib/ds/plhash.h',
103 '<(nss_directory)/nspr/lib/libc/include/plbase64.h', 104 '<(nss_directory)/nspr/lib/libc/include/plbase64.h',
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 '-Wno-incompatible-pointer-types', 452 '-Wno-incompatible-pointer-types',
452 '-Wno-pointer-sign', 453 '-Wno-pointer-sign',
453 ], 454 ],
454 }], 455 }],
455 ], 456 ],
456 }, 457 },
457 { 458 {
458 'target_name': 'nss_dart', # Added by Dart (the _dart postfix) 459 'target_name': 'nss_dart', # Added by Dart (the _dart postfix)
459 'product_name': 'crnss', 460 'product_name': 'crnss',
460 'type': '<(component)', 461 'type': '<(component)',
462 'toolsets':['host','target'],
461 'dependencies': [ 463 'dependencies': [
462 'nss_static_dart', # Added by Dart (the _dart postfix) 464 'nss_static_dart', # Added by Dart (the _dart postfix)
463 ], 465 ],
464 'export_dependent_settings': [ 466 'export_dependent_settings': [
465 'nss_static_dart', # Added by Dart (the _dart postfix) 467 'nss_static_dart', # Added by Dart (the _dart postfix)
466 ], 468 ],
467 'sources': [ 469 'sources': [
468 # Ensure at least one object file is produced, so that MSVC does not 470 # Ensure at least one object file is produced, so that MSVC does not
469 # warn when creating the static/shared library. See the note for 471 # warn when creating the static/shared library. See the note for
470 # the 'nssckbi' target for why the 'nss' target was split as such. 472 # the 'nssckbi' target for why the 'nss' target was split as such.
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 # artifact of how NSS is being statically built, which is not an 504 # artifact of how NSS is being statically built, which is not an
503 # officially supported configuration - normally, 'nssckbi.dll/so' would 505 # officially supported configuration - normally, 'nssckbi.dll/so' would
504 # depend on libnss3.dll/so, and the higher layer caller would instruct 506 # depend on libnss3.dll/so, and the higher layer caller would instruct
505 # libnss3.dll to dynamically load nssckbi.dll, breaking the circle. 507 # libnss3.dll to dynamically load nssckbi.dll, breaking the circle.
506 # 508 #
507 # TODO(rsleevi): http://crbug.com/128134 - Break the circular dependency 509 # TODO(rsleevi): http://crbug.com/128134 - Break the circular dependency
508 # without requiring nssckbi to be built as a shared library. 510 # without requiring nssckbi to be built as a shared library.
509 'target_name': 'nssckbi_dart', # Added by Dart (the _dart postfix) 511 'target_name': 'nssckbi_dart', # Added by Dart (the _dart postfix)
510 'product_name': 'crnssckbi', 512 'product_name': 'crnssckbi',
511 'type': 'static_library', 513 'type': 'static_library',
514 'toolsets':['host','target'],
512 # This target is an implementation detail - the public dependencies 515 # This target is an implementation detail - the public dependencies
513 # should be on 'nss'. 516 # should be on 'nss'.
514 'suppress_wildcard': 1, 517 'suppress_wildcard': 1,
515 'sources': [ 518 'sources': [
516 '<(nss_directory)/nss/lib/ckfw/builtins/anchor.c', 519 '<(nss_directory)/nss/lib/ckfw/builtins/anchor.c',
517 '<(nss_directory)/nss/lib/ckfw/builtins/bfind.c', 520 '<(nss_directory)/nss/lib/ckfw/builtins/bfind.c',
518 '<(nss_directory)/nss/lib/ckfw/builtins/binst.c', 521 '<(nss_directory)/nss/lib/ckfw/builtins/binst.c',
519 '<(nss_directory)/nss/lib/ckfw/builtins/bobject.c', 522 '<(nss_directory)/nss/lib/ckfw/builtins/bobject.c',
520 '<(nss_directory)/nss/lib/ckfw/builtins/bsession.c', 523 '<(nss_directory)/nss/lib/ckfw/builtins/bsession.c',
521 '<(nss_directory)/nss/lib/ckfw/builtins/bslot.c', 524 '<(nss_directory)/nss/lib/ckfw/builtins/bslot.c',
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 ], 567 ],
565 'direct_dependent_settings': { 568 'direct_dependent_settings': {
566 'include_dirs': [ 569 'include_dirs': [
567 '<(nss_directory)/nss/lib/ckfw/builtins', 570 '<(nss_directory)/nss/lib/ckfw/builtins',
568 ], 571 ],
569 }, 572 },
570 }, 573 },
571 { 574 {
572 'target_name': 'nss_static_dart', # Added by Dart (the _dart postfix) 575 'target_name': 'nss_static_dart', # Added by Dart (the _dart postfix)
573 'type': 'static_library', 576 'type': 'static_library',
577 'toolsets':['host','target'],
574 # This target is an implementation detail - the public dependencies 578 # This target is an implementation detail - the public dependencies
575 # should be on 'nss'. 579 # should be on 'nss'.
576 'suppress_wildcard': 1, 580 'suppress_wildcard': 1,
577 'sources': [ 581 'sources': [
578 '<(nss_directory)/nss/lib/base/arena.c', 582 '<(nss_directory)/nss/lib/base/arena.c',
579 '<(nss_directory)/nss/lib/base/base.h', 583 '<(nss_directory)/nss/lib/base/base.h',
580 '<(nss_directory)/nss/lib/base/baset.h', 584 '<(nss_directory)/nss/lib/base/baset.h',
581 '<(nss_directory)/nss/lib/base/error.c', 585 '<(nss_directory)/nss/lib/base/error.c',
582 '<(nss_directory)/nss/lib/base/errorval.c', 586 '<(nss_directory)/nss/lib/base/errorval.c',
583 '<(nss_directory)/nss/lib/base/hash.c', 587 '<(nss_directory)/nss/lib/base/hash.c',
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
1313 '-Wno-logical-op-parentheses', 1317 '-Wno-logical-op-parentheses',
1314 '-Wno-switch', 1318 '-Wno-switch',
1315 '-Wno-tautological-compare', 1319 '-Wno-tautological-compare',
1316 ], 1320 ],
1317 }], 1321 }],
1318 ], 1322 ],
1319 }, 1323 },
1320 ], 1324 ],
1321 }]], 1325 }]],
1322 } 1326 }
OLDNEW
« no previous file with comments | « runtime/bin/bin.gypi ('k') | runtime/bin/net/sqlite.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698