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

Side by Side Diff: webrtc/base/BUILD.gn

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 | « talk/media/sctp/sctpdataengine_unittest.cc ('k') | webrtc/base/base.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) 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 import("//build/config/crypto.gni") 9 import("//build/config/crypto.gni")
10 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
(...skipping 21 matching lines...) Expand all
32 defines = [ "NO_MAIN_THREAD_WRAPPING" ] 32 defines = [ "NO_MAIN_THREAD_WRAPPING" ]
33 } 33 }
34 34
35 config("openssl_config") { 35 config("openssl_config") {
36 defines = [ 36 defines = [
37 "SSL_USE_OPENSSL", 37 "SSL_USE_OPENSSL",
38 "HAVE_OPENSSL_SSL_H", 38 "HAVE_OPENSSL_SSL_H",
39 ] 39 ]
40 } 40 }
41 41
42 config("nss_config") {
43 defines = [
44 "SSL_USE_NSS",
45 "HAVE_NSS_SSL_H",
46 "SSL_USE_NSS_RNG",
47 ]
48 }
49
42 config("ios_config") { 50 config("ios_config") {
43 libs = [ 51 libs = [
44 "CFNetwork.framework", 52 "CFNetwork.framework",
45 53
46 #"Foundation.framework", # Already included in //build/config:default_libs. 54 #"Foundation.framework", # Already included in //build/config:default_libs.
47 "Security.framework", 55 "Security.framework",
48 "SystemConfiguration.framework", 56 "SystemConfiguration.framework",
49 57
50 #"UIKit.framework", # Already included in //build/config:default_libs. 58 #"UIKit.framework", # Already included in //build/config:default_libs.
51 ] 59 ]
(...skipping 17 matching lines...) Expand all
69 } 77 }
70 78
71 if (is_linux && !build_with_chromium) { 79 if (is_linux && !build_with_chromium) {
72 # Provides the same functionality as the //crypto:platform target, which 80 # Provides the same functionality as the //crypto:platform target, which
73 # WebRTC cannot use as we don't sync src/crypto from Chromium. 81 # WebRTC cannot use as we don't sync src/crypto from Chromium.
74 group("linux_system_ssl") { 82 group("linux_system_ssl") {
75 if (use_openssl) { 83 if (use_openssl) {
76 deps = [ 84 deps = [
77 "//third_party/boringssl", 85 "//third_party/boringssl",
78 ] 86 ]
87 } else {
88 deps = [
89 "//net/third_party/nss/ssl:libssl",
90 ]
91
92 public_configs = [
93 "//net/third_party/nss/ssl:ssl_config",
94 "//third_party/nss:system_nss_no_ssl_config",
95 ]
79 } 96 }
80 } 97 }
81 } 98 }
82 99
83 if (rtc_build_ssl == 0) { 100 if (rtc_build_ssl == 0) {
84 config("external_ssl_library") { 101 config("external_ssl_library") {
85 assert(rtc_ssl_root != "", 102 assert(rtc_ssl_root != "",
86 "You must specify rtc_ssl_root when rtc_build_ssl==0.") 103 "You must specify rtc_ssl_root when rtc_build_ssl==0.")
87 include_dirs = [ rtc_ssl_root ] 104 include_dirs = [ rtc_ssl_root ]
88 } 105 }
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 "openssl.h", 490 "openssl.h",
474 "openssladapter.cc", 491 "openssladapter.cc",
475 "openssladapter.h", 492 "openssladapter.h",
476 "openssldigest.cc", 493 "openssldigest.cc",
477 "openssldigest.h", 494 "openssldigest.h",
478 "opensslidentity.cc", 495 "opensslidentity.cc",
479 "opensslidentity.h", 496 "opensslidentity.h",
480 "opensslstreamadapter.cc", 497 "opensslstreamadapter.cc",
481 "opensslstreamadapter.h", 498 "opensslstreamadapter.h",
482 ] 499 ]
500 } else {
501 public_configs += [ ":nss_config" ]
502 if (rtc_build_ssl) {
503 if (build_with_chromium) {
504 deps += [ "//crypto:platform" ]
505 } else {
506 deps += [ "//net/third_party/nss/ssl:libssl" ]
507 if (is_linux) {
508 deps += [ ":linux_system_ssl" ]
509 } else {
510 deps += [
511 "//third_party/nss:nspr",
512 "//third_party/nss:nss",
513 ]
514 }
515 }
516 } else {
517 configs += [ "external_ssl_library" ]
518 }
519 sources += [
520 "nssidentity.cc",
521 "nssidentity.h",
522 "nssstreamadapter.cc",
523 "nssstreamadapter.h",
524 ]
483 } 525 }
484 526
485 if (is_android) { 527 if (is_android) {
486 sources += [ 528 sources += [
487 "ifaddrs-android.cc", 529 "ifaddrs-android.cc",
488 "ifaddrs-android.h", 530 "ifaddrs-android.h",
489 ] 531 ]
490 532
491 libs += [ 533 libs += [
492 "log", 534 "log",
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 "linux.cc", 634 "linux.cc",
593 "linux.h", 635 "linux.h",
594 ] 636 ]
595 } 637 }
596 638
597 if (is_nacl) { 639 if (is_nacl) {
598 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] 640 deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
599 defines += [ "timezone=_timezone" ] 641 defines += [ "timezone=_timezone" ]
600 } 642 }
601 } 643 }
OLDNEW
« no previous file with comments | « talk/media/sctp/sctpdataengine_unittest.cc ('k') | webrtc/base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698