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

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

Issue 1862123002: Restore BoringSSL behavior for webrtc/base/BUILD.gn (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Restored ios_config dependency as well Created 4 years, 8 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 | « no previous file | no next file » | 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 "messagehandler.h", 268 "messagehandler.h",
269 "messagequeue.cc", 269 "messagequeue.cc",
270 "messagequeue.h", 270 "messagequeue.h",
271 "nethelpers.cc", 271 "nethelpers.cc",
272 "nethelpers.h", 272 "nethelpers.h",
273 "network.cc", 273 "network.cc",
274 "network.h", 274 "network.h",
275 "networkmonitor.cc", 275 "networkmonitor.cc",
276 "networkmonitor.h", 276 "networkmonitor.h",
277 "nullsocketserver.h", 277 "nullsocketserver.h",
278 "openssl.h",
279 "openssladapter.cc",
280 "openssladapter.h",
281 "openssldigest.cc",
282 "openssldigest.h",
283 "opensslidentity.cc",
284 "opensslidentity.h",
285 "opensslstreamadapter.cc",
286 "opensslstreamadapter.h",
287 "pathutils.cc", 278 "pathutils.cc",
288 "pathutils.h", 279 "pathutils.h",
289 "physicalsocketserver.cc", 280 "physicalsocketserver.cc",
290 "physicalsocketserver.h", 281 "physicalsocketserver.h",
291 "proxydetect.cc", 282 "proxydetect.cc",
292 "proxydetect.h", 283 "proxydetect.h",
293 "proxyinfo.cc", 284 "proxyinfo.cc",
294 "proxyinfo.h", 285 "proxyinfo.h",
295 "ratelimiter.cc", 286 "ratelimiter.cc",
296 "ratelimiter.h", 287 "ratelimiter.h",
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 456
466 # TODO(henrike): issue 3307, make rtc_base build with the Chromium default 457 # TODO(henrike): issue 3307, make rtc_base build with the Chromium default
467 # compiler settings. 458 # compiler settings.
468 configs -= [ "//build/config/compiler:chromium_code" ] 459 configs -= [ "//build/config/compiler:chromium_code" ]
469 configs += [ "//build/config/compiler:no_chromium_code" ] 460 configs += [ "//build/config/compiler:no_chromium_code" ]
470 if (!is_win) { 461 if (!is_win) {
471 cflags += [ "-Wno-uninitialized" ] 462 cflags += [ "-Wno-uninitialized" ]
472 cflags_cc += [ "-Wno-non-virtual-dtor" ] 463 cflags_cc += [ "-Wno-non-virtual-dtor" ]
473 } 464 }
474 465
475 if (rtc_build_ssl) { 466 # TODO(kjellander): The use_openssl block should really go away in order for
476 deps += [ "//third_party/boringssl" ] 467 # the GN build to be similar to the GYP build. See http://crbug.com/601042 for
477 } else { 468 # more details.
478 configs += [ "external_ssl_library" ] 469 if (use_openssl) {
470 if (rtc_build_ssl) {
471 deps += [ "//third_party/boringssl" ]
472 } else {
473 configs += [ "external_ssl_library" ]
474 }
475 sources += [
476 "openssl.h",
477 "openssladapter.cc",
478 "openssladapter.h",
479 "openssldigest.cc",
480 "openssldigest.h",
481 "opensslidentity.cc",
482 "opensslidentity.h",
483 "opensslstreamadapter.cc",
484 "opensslstreamadapter.h",
485 ]
479 } 486 }
480 487
481 if (is_android) { 488 if (is_android) {
482 sources += [ 489 sources += [
483 "ifaddrs-android.cc", 490 "ifaddrs-android.cc",
484 "ifaddrs-android.h", 491 "ifaddrs-android.h",
485 ] 492 ]
486 493
487 libs += [ 494 libs += [
488 "log", 495 "log",
489 "GLESv2", 496 "GLESv2",
490 ] 497 ]
491 } 498 }
492 499
493 if (is_ios || is_mac) { 500 if (is_ios || is_mac) {
501 if (is_ios) {
502 all_dependent_configs = [ ":ios_config" ]
503 }
494 sources += [ 504 sources += [
495 "maccocoathreadhelper.h", 505 "maccocoathreadhelper.h",
496 "maccocoathreadhelper.mm", 506 "maccocoathreadhelper.mm",
497 "macconversion.cc", 507 "macconversion.cc",
498 "macconversion.h", 508 "macconversion.h",
499 "macifaddrs_converter.cc", 509 "macifaddrs_converter.cc",
500 "scoped_autorelease_pool.h", 510 "scoped_autorelease_pool.h",
501 "scoped_autorelease_pool.mm", 511 "scoped_autorelease_pool.mm",
502 ] 512 ]
503 } 513 }
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 } 606 }
597 607
598 if (is_nacl) { 608 if (is_nacl) {
599 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] 609 deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
600 defines += [ "timezone=_timezone" ] 610 defines += [ "timezone=_timezone" ]
601 sources -= [ "ifaddrs_converter.cc" ] 611 sources -= [ "ifaddrs_converter.cc" ]
602 } 612 }
603 } 613 }
604 614
605 if (is_ios) { 615 if (is_ios) {
606 all_dependent_configs = [ ":ios_config" ]
607
608 source_set("rtc_base_objc") { 616 source_set("rtc_base_objc") {
609 deps = [ 617 deps = [
610 ":rtc_base", 618 ":rtc_base",
611 ] 619 ]
612 cflags = [ "-fobjc-arc" ] 620 cflags = [ "-fobjc-arc" ]
613 configs += [ "..:common_config" ] 621 configs += [ "..:common_config" ]
614 public_configs = [ "..:common_inherited_config" ] 622 public_configs = [ "..:common_inherited_config" ]
615 623
616 sources = [ 624 sources = [
617 "objc/NSString+StdString.h", 625 "objc/NSString+StdString.h",
(...skipping 17 matching lines...) Expand all
635 "objc/RTCUIApplication.mm", 643 "objc/RTCUIApplication.mm",
636 ] 644 ]
637 } 645 }
638 } 646 }
639 647
640 source_set("gtest_prod") { 648 source_set("gtest_prod") {
641 sources = [ 649 sources = [
642 "gtest_prod_util.h", 650 "gtest_prod_util.h",
643 ] 651 ]
644 } 652 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698