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

Side by Side Diff: base/base.gypi

Issue 5014001: Reverted because openssl_helper needs to build even on non-openssl builds... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | build/common.gypi » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 { 5 {
6 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'base_target': 0, 8 'base_target': 0,
9 'base_extra_target': 0, 9 'base_extra_target': 0,
10 }, 10 },
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 'file_version_info.cc', 532 'file_version_info.cc',
533 'image_util.cc', 533 'image_util.cc',
534 'object_watcher.cc', 534 'object_watcher.cc',
535 'pe_image.cc', 535 'pe_image.cc',
536 'registry.cc', 536 'registry.cc',
537 'resource_util.cc', 537 'resource_util.cc',
538 'win_util.cc', 538 'win_util.cc',
539 ], 539 ],
540 },], 540 },],
541 [ 'use_openssl==1', { 541 [ 'use_openssl==1', {
542 # TODO(joth): Use a glob to match exclude patterns once the
543 # OpenSSL file set is complete.
542 'sources!': [ 544 'sources!': [
545 'crypto/encryptor_nss.cc',
546 'crypto/rsa_private_key_nss.cc',
547 'crypto/signature_creator_nss.cc',
548 'crypto/signature_verifier_nss.cc',
549 'crypto/symmetric_key_nss.cc',
550 'hmac_nss.cc',
551 'nss_util.cc',
552 'nss_util.h',
543 # Note that sha2.cc depends on the NSS files bundled into 553 # Note that sha2.cc depends on the NSS files bundled into
544 # chromium; it does not have the _nss postfix as it is required 554 # chromium; it does not have the _nss postfix as it is required
545 # on platforms besides linux and *bsd. 555 # on platforms besides linux and *bsd.
546 'sha2.cc', 556 'sha2.cc',
557 'third_party/nss/blapi.h',
558 'third_party/nss/blapit.h',
559 'third_party/nss/sha256.h',
560 'third_party/nss/sha512.cc',
561 ],
562 }, {
563 'sources!': [
564 'crypto/encryptor_openssl.cc',
565 'crypto/rsa_private_key_openssl.cc',
566 'crypto/signature_creator_openssl.cc',
567 'crypto/signature_verifier_openssl.cc',
568 'crypto/symmetric_key_openssl.cc',
569 'hmac_openssl.cc',
570 'openssl_util.cc',
571 'openssl_util.h',
572 'sha2_openssl.cc',
547 ], 573 ],
548 },], 574 },],
549 ], 575 ],
550 }], 576 }],
551 ], 577 ],
552 }, 578 },
553 'targets': [ 579 'targets': [
554 { 580 {
555 'target_name': 'base', 581 'target_name': 'base',
556 'type': '<(library)', 582 'type': '<(library)',
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 'third_party/xdg_mime/xdgmimemagic.c', 813 'third_party/xdg_mime/xdgmimemagic.c',
788 'third_party/xdg_mime/xdgmimemagic.h', 814 'third_party/xdg_mime/xdgmimemagic.h',
789 'third_party/xdg_mime/xdgmimeparent.c', 815 'third_party/xdg_mime/xdgmimeparent.c',
790 'third_party/xdg_mime/xdgmimeparent.h', 816 'third_party/xdg_mime/xdgmimeparent.h',
791 ], 817 ],
792 }, 818 },
793 ], 819 ],
794 }], 820 }],
795 ], 821 ],
796 } 822 }
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698