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

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

Issue 11365165: Change names of all NSS gyp targets, so they don't conflict with the Chromium target names. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: 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
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 165464 (this should agree with "nss_rev" in DEPS). 10 # Revision 165464 (this should agree with "nss_rev" in DEPS).
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 } 79 }
80 }, 80 },
81 'defines!': [ 81 'defines!': [
82 'WIN32_LEAN_AND_MEAN', 82 'WIN32_LEAN_AND_MEAN',
83 ], 83 ],
84 }], 84 }],
85 ], 85 ],
86 }, 86 },
87 'targets': [ 87 'targets': [
88 { 88 {
89 'target_name': 'nspr', 89 'target_name': 'nspr_dart',
90 'product_name': 'crnspr', 90 'product_name': 'crnspr',
91 'type': '<(component)', 91 'type': '<(component)',
92 # Changed by Dart: '<(nss_directory)/' added to all paths. 92 # Changed by Dart: '<(nss_directory)/' added to all paths.
93 'sources': [ 93 'sources': [
94 # Added by Dart. 94 # Added by Dart.
95 'os_linux.S', 95 'os_linux.S',
96 '<(nss_directory)/mozilla/nsprpub/lib/ds/plarena.c', 96 '<(nss_directory)/mozilla/nsprpub/lib/ds/plarena.c',
97 '<(nss_directory)/mozilla/nsprpub/lib/ds/plarena.h', 97 '<(nss_directory)/mozilla/nsprpub/lib/ds/plarena.h',
98 '<(nss_directory)/mozilla/nsprpub/lib/ds/plarenas.h', 98 '<(nss_directory)/mozilla/nsprpub/lib/ds/plarenas.h',
99 '<(nss_directory)/mozilla/nsprpub/lib/ds/plhash.c', 99 '<(nss_directory)/mozilla/nsprpub/lib/ds/plhash.c',
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 ], 446 ],
447 }, 447 },
448 'cflags': [ 448 'cflags': [
449 '-Wno-incompatible-pointer-types', 449 '-Wno-incompatible-pointer-types',
450 '-Wno-pointer-sign', 450 '-Wno-pointer-sign',
451 ], 451 ],
452 }], 452 }],
453 ], 453 ],
454 }, 454 },
455 { 455 {
456 'target_name': 'nss', 456 'target_name': 'nss_dart',
457 'product_name': 'crnss', 457 'product_name': 'crnss',
458 'type': '<(component)', 458 'type': '<(component)',
459 'dependencies': [ 459 'dependencies': [
460 'nss_static', 460 'nss_static_dart',
461 ], 461 ],
462 'export_dependent_settings': [ 462 'export_dependent_settings': [
463 'nss_static', 463 'nss_static_dart',
464 ], 464 ],
465 'sources': [ 465 'sources': [
466 # Ensure at least one object file is produced, so that MSVC does not 466 # Ensure at least one object file is produced, so that MSVC does not
467 # warn when creating the static/shared library. See the note for 467 # warn when creating the static/shared library. See the note for
468 # the 'nssckbi' target for why the 'nss' target was split as such. 468 # the 'nssckbi' target for why the 'nss' target was split as such.
469 '<(nss_directory)/mozilla/security/nss/lib/nss/nssver.c', 469 '<(nss_directory)/mozilla/security/nss/lib/nss/nssver.c',
470 ], 470 ],
471 'conditions': [ 471 'conditions': [
472 ['exclude_nss_root_certs==0', { 472 ['exclude_nss_root_certs==0', {
473 'dependencies': [ 473 'dependencies': [
474 'nssckbi', 474 'nssckbi_dart',
475 ], 475 ],
476 'export_dependent_settings': [ 476 'export_dependent_settings': [
477 'nssckbi', 477 'nssckbi_dart',
478 ], 478 ],
479 }], 479 }],
480 ['OS == "mac" and component == "shared_library"', { 480 ['OS == "mac" and component == "shared_library"', {
481 'xcode_settings': { 481 'xcode_settings': {
482 'OTHER_LDFLAGS': ['-all_load'], 482 'OTHER_LDFLAGS': ['-all_load'],
483 }, 483 },
484 }], 484 }],
485 ['OS == "win" and component == "shared_library"', { 485 ['OS == "win" and component == "shared_library"', {
486 'sources': [ 486 'sources': [
487 '<(nss_directory)/mozilla/security/nss/exports_win.def', 487 '<(nss_directory)/mozilla/security/nss/exports_win.def',
488 ], 488 ],
489 }], 489 }],
490 ], 490 ],
491 }, 491 },
492 { 492 {
493 # This is really more of a pseudo-target to work around the fact that 493 # This is really more of a pseudo-target to work around the fact that
494 # a single static_library target cannot contain two object files of the 494 # a single static_library target cannot contain two object files of the
495 # same name (hash.o / hash.obj). Logically, this is part of the 495 # same name (hash.o / hash.obj). Logically, this is part of the
496 # 'nss_static' target. By separating it out, it creates a possible 496 # 'nss_static' target. By separating it out, it creates a possible
497 # circular dependency between 'nss_static' and 'nssckbi' when 497 # circular dependency between 'nss_static' and 'nssckbi' when
498 # 'exclude_nss_root_certs' is not specified, as 'nss_static' depends on 498 # 'exclude_nss_root_certs' is not specified, as 'nss_static' depends on
499 # the 'builtinsC_GetFunctionList' exported by this target. This is an 499 # the 'builtinsC_GetFunctionList' exported by this target. This is an
500 # artifact of how NSS is being statically built, which is not an 500 # artifact of how NSS is being statically built, which is not an
501 # officially supported configuration - normally, 'nssckbi.dll/so' would 501 # officially supported configuration - normally, 'nssckbi.dll/so' would
502 # depend on libnss3.dll/so, and the higher layer caller would instruct 502 # depend on libnss3.dll/so, and the higher layer caller would instruct
503 # libnss3.dll to dynamically load nssckbi.dll, breaking the circle. 503 # libnss3.dll to dynamically load nssckbi.dll, breaking the circle.
504 # 504 #
505 # TODO(rsleevi): http://crbug.com/128134 - Break the circular dependency 505 # TODO(rsleevi): http://crbug.com/128134 - Break the circular dependency
506 # without requiring nssckbi to be built as a shared library. 506 # without requiring nssckbi to be built as a shared library.
507 'target_name': 'nssckbi', 507 'target_name': 'nssckbi_dart',
508 'product_name': 'crnssckbi', 508 'product_name': 'crnssckbi',
509 'type': 'static_library', 509 'type': 'static_library',
510 # This target is an implementation detail - the public dependencies 510 # This target is an implementation detail - the public dependencies
511 # should be on 'nss'. 511 # should be on 'nss'.
512 'suppress_wildcard': 1, 512 'suppress_wildcard': 1,
513 'sources': [ 513 'sources': [
514 '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/anchor.c', 514 '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/anchor.c',
515 '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/bfind.c', 515 '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/bfind.c',
516 '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/binst.c', 516 '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/binst.c',
517 '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/bobject.c', 517 '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins/bobject.c',
(...skipping 27 matching lines...) Expand all
545 '<(nss_directory)/mozilla/security/nss/lib/ckfw/nssckmdt.h', 545 '<(nss_directory)/mozilla/security/nss/lib/ckfw/nssckmdt.h',
546 '<(nss_directory)/mozilla/security/nss/lib/ckfw/nssckt.h', 546 '<(nss_directory)/mozilla/security/nss/lib/ckfw/nssckt.h',
547 '<(nss_directory)/mozilla/security/nss/lib/ckfw/object.c', 547 '<(nss_directory)/mozilla/security/nss/lib/ckfw/object.c',
548 '<(nss_directory)/mozilla/security/nss/lib/ckfw/session.c', 548 '<(nss_directory)/mozilla/security/nss/lib/ckfw/session.c',
549 '<(nss_directory)/mozilla/security/nss/lib/ckfw/sessobj.c', 549 '<(nss_directory)/mozilla/security/nss/lib/ckfw/sessobj.c',
550 '<(nss_directory)/mozilla/security/nss/lib/ckfw/slot.c', 550 '<(nss_directory)/mozilla/security/nss/lib/ckfw/slot.c',
551 '<(nss_directory)/mozilla/security/nss/lib/ckfw/token.c', 551 '<(nss_directory)/mozilla/security/nss/lib/ckfw/token.c',
552 '<(nss_directory)/mozilla/security/nss/lib/ckfw/wrap.c', 552 '<(nss_directory)/mozilla/security/nss/lib/ckfw/wrap.c',
553 ], 553 ],
554 'dependencies': [ 554 'dependencies': [
555 'nss_static', 555 'nss_static_dart',
556 ], 556 ],
557 'export_dependent_settings': [ 557 'export_dependent_settings': [
558 'nss_static', 558 'nss_static_dart',
559 ], 559 ],
560 'include_dirs': [ 560 'include_dirs': [
561 '<(nss_directory)/mozilla/security/nss/lib/ckfw', 561 '<(nss_directory)/mozilla/security/nss/lib/ckfw',
562 ], 562 ],
563 'direct_dependent_settings': { 563 'direct_dependent_settings': {
564 'include_dirs': [ 564 'include_dirs': [
565 '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins', 565 '<(nss_directory)/mozilla/security/nss/lib/ckfw/builtins',
566 ], 566 ],
567 }, 567 },
568 }, 568 },
569 { 569 {
570 'target_name': 'nss_static', 570 'target_name': 'nss_static_dart',
571 'type': 'static_library', 571 'type': 'static_library',
572 # This target is an implementation detail - the public dependencies 572 # This target is an implementation detail - the public dependencies
573 # should be on 'nss'. 573 # should be on 'nss'.
574 'suppress_wildcard': 1, 574 'suppress_wildcard': 1,
575 'sources': [ 575 'sources': [
576 '<(nss_directory)/mozilla/security/nss/lib/base/arena.c', 576 '<(nss_directory)/mozilla/security/nss/lib/base/arena.c',
577 '<(nss_directory)/mozilla/security/nss/lib/base/base.h', 577 '<(nss_directory)/mozilla/security/nss/lib/base/base.h',
578 '<(nss_directory)/mozilla/security/nss/lib/base/baset.h', 578 '<(nss_directory)/mozilla/security/nss/lib/base/baset.h',
579 '<(nss_directory)/mozilla/security/nss/lib/base/error.c', 579 '<(nss_directory)/mozilla/security/nss/lib/base/error.c',
580 '<(nss_directory)/mozilla/security/nss/lib/base/errorval.c', 580 '<(nss_directory)/mozilla/security/nss/lib/base/errorval.c',
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 'sources!': [ 1050 'sources!': [
1051 # primes.c is included by mpprime.c. 1051 # primes.c is included by mpprime.c.
1052 '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/primes.c', 1052 '<(nss_directory)/mozilla/security/nss/lib/freebl/mpi/primes.c',
1053 # unix_rand.c and win_rand.c are included by sysrand.c. 1053 # unix_rand.c and win_rand.c are included by sysrand.c.
1054 '<(nss_directory)/mozilla/security/nss/lib/freebl/unix_rand.c', 1054 '<(nss_directory)/mozilla/security/nss/lib/freebl/unix_rand.c',
1055 '<(nss_directory)/mozilla/security/nss/lib/freebl/win_rand.c', 1055 '<(nss_directory)/mozilla/security/nss/lib/freebl/win_rand.c',
1056 # debug_module.c is included by pk11load.c. 1056 # debug_module.c is included by pk11load.c.
1057 '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/debug_module.c', 1057 '<(nss_directory)/mozilla/security/nss/lib/pk11wrap/debug_module.c',
1058 ], 1058 ],
1059 'dependencies': [ 1059 'dependencies': [
1060 'nspr', 1060 'nspr_dart',
1061 'sqlite.gyp:sqlite', 1061 'sqlite.gyp:sqlite_dart',
1062 ], 1062 ],
1063 'export_dependent_settings': [ 1063 'export_dependent_settings': [
1064 'nspr', 1064 'nspr_dart',
1065 ], 1065 ],
1066 'defines': [ 1066 'defines': [
1067 'MP_API_COMPATIBLE', 1067 'MP_API_COMPATIBLE',
1068 'NSS_DISABLE_DBM', 1068 'NSS_DISABLE_DBM',
1069 'NSS_ENABLE_ECC', 1069 'NSS_ENABLE_ECC',
1070 'NSS_STATIC', 1070 'NSS_STATIC',
1071 'NSS_USE_STATIC_LIBS', 1071 'NSS_USE_STATIC_LIBS',
1072 'RIJNDAEL_INCLUDE_TABLES', 1072 'RIJNDAEL_INCLUDE_TABLES',
1073 'SHLIB_VERSION=\"3\"', 1073 'SHLIB_VERSION=\"3\"',
1074 'SOFTOKEN_SHLIB_VERSION=\"3\"', 1074 'SOFTOKEN_SHLIB_VERSION=\"3\"',
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 '-Wno-incompatible-pointer-types', 1264 '-Wno-incompatible-pointer-types',
1265 '-Wno-logical-op-parentheses', 1265 '-Wno-logical-op-parentheses',
1266 '-Wno-switch', 1266 '-Wno-switch',
1267 '-Wno-tautological-compare', 1267 '-Wno-tautological-compare',
1268 ], 1268 ],
1269 }], 1269 }],
1270 ], 1270 ],
1271 }, 1271 },
1272 ], 1272 ],
1273 } 1273 }
OLDNEW
« runtime/bin/bin.gypi ('K') | « 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