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

Side by Side Diff: webrtc/base/base.gyp

Issue 1311843006: Revert of purge nss files and dependencies (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 | « webrtc/base/BUILD.gn ('k') | webrtc/base/helpers.cc » ('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) 2014 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 ['build_ssl==1', { 521 ['build_ssl==1', {
522 'dependencies': [ 522 'dependencies': [
523 '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl', 523 '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
524 ], 524 ],
525 }, { 525 }, {
526 'include_dirs': [ 526 'include_dirs': [
527 '<(ssl_root)', 527 '<(ssl_root)',
528 ], 528 ],
529 }], 529 }],
530 ], 530 ],
531 }, {
532 'sources': [
533 'nssidentity.cc',
534 'nssidentity.h',
535 'nssstreamadapter.cc',
536 'nssstreamadapter.h',
537 ],
538 'conditions': [
539 ['use_legacy_ssl_defaults!=1', {
540 'defines': [
541 'SSL_USE_NSS',
542 'HAVE_NSS_SSL_H',
543 'SSL_USE_NSS_RNG',
544 ],
545 'direct_dependent_settings': {
546 'defines': [
547 'SSL_USE_NSS',
548 'HAVE_NSS_SSL_H',
549 'SSL_USE_NSS_RNG',
550 ],
551 },
552 }],
553 ['build_ssl==1', {
554 'conditions': [
555 # On some platforms, the rest of NSS is bundled. On others,
556 # it's pulled from the system.
557 ['OS == "mac" or OS == "ios"', {
558 'dependencies': [
559 '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
560 '<(DEPTH)/third_party/nss/nss.gyp:nspr',
561 '<(DEPTH)/third_party/nss/nss.gyp:nss',
562 ],
563 }],
564 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "andro id"', {
565 'dependencies': [
566 '<(DEPTH)/build/linux/system.gyp:ssl',
567 ],
568 }],
569 ],
570 }, {
571 'include_dirs': [
572 '<(ssl_root)',
573 ],
574 }],
575 ],
531 }], 576 }],
532 ['OS == "android"', { 577 ['OS == "android"', {
533 'link_settings': { 578 'link_settings': {
534 'libraries': [ 579 'libraries': [
535 '-llog', 580 '-llog',
536 '-lGLESv2', 581 '-lGLESv2',
537 ], 582 ],
538 }, 583 },
539 }, { 584 }, {
540 'sources!': [ 585 'sources!': [
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 ['OS!="linux" and OS!="android"', { 739 ['OS!="linux" and OS!="android"', {
695 'sources!': [ 740 'sources!': [
696 'linux.cc', 741 'linux.cc',
697 'linux.h', 742 'linux.h',
698 ], 743 ],
699 }], 744 }],
700 ], 745 ],
701 }, 746 },
702 ], 747 ],
703 } 748 }
OLDNEW
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | webrtc/base/helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698