OLD | NEW |
---|---|
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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
422 ] | 422 ] |
423 } else { | 423 } else { |
424 include_dirs = [ "$rtc_jsoncpp_root" ] | 424 include_dirs = [ "$rtc_jsoncpp_root" ] |
425 | 425 |
426 # When defined changes the include path for json.h to where it is | 426 # When defined changes the include path for json.h to where it is |
427 # expected to be when building json outside of the standalone build. | 427 # expected to be when building json outside of the standalone build. |
428 defines += [ "WEBRTC_EXTERNAL_JSON" ] | 428 defines += [ "WEBRTC_EXTERNAL_JSON" ] |
429 } | 429 } |
430 } | 430 } |
431 | 431 |
432 rtc_static_library("rtc_base") { | 432 rtc_source_set("rtc_base") { |
433 public_deps = [ | |
434 ":rtc_base_generic", | |
435 ] | |
436 if (is_ios || is_mac) { | |
437 public_deps += [ ":rtc_base_objc" ] | |
438 } | |
439 } | |
440 | |
441 if (is_ios || is_mac) { | |
442 rtc_source_set("rtc_base_objc") { | |
443 sources = [ | |
444 "thread_darwin.mm", | |
mbonadei
2017/09/01 09:28:23
Good news: applefilesystem.mm has been removed in
| |
445 ] | |
446 deps = [ | |
447 ":rtc_base_generic", | |
448 ] | |
449 visibility = [ ":rtc_base" ] | |
450 } | |
451 } | |
452 | |
453 rtc_source_set("rtc_base_generic") { | |
mbonadei
2017/09/01 09:28:23
I also switched this to source_set (it is not clea
kwiberg-webrtc
2017/09/01 11:23:45
I think the main effect will be to reduce link tim
| |
433 cflags = [] | 454 cflags = [] |
434 cflags_cc = [] | 455 cflags_cc = [] |
435 libs = [] | 456 libs = [] |
436 defines = [] | 457 defines = [] |
437 deps = [ | 458 deps = [ |
438 "..:webrtc_common", | 459 "..:webrtc_common", |
439 ] | 460 ] |
440 public_deps = [ | 461 public_deps = [ |
441 ":rtc_base_approved", | 462 ":rtc_base_approved", |
442 ] | 463 ] |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
531 "sslidentity.cc", | 552 "sslidentity.cc", |
532 "sslidentity.h", | 553 "sslidentity.h", |
533 "sslstreamadapter.cc", | 554 "sslstreamadapter.cc", |
534 "sslstreamadapter.h", | 555 "sslstreamadapter.h", |
535 "stream.cc", | 556 "stream.cc", |
536 "stream.h", | 557 "stream.h", |
537 "thread.cc", | 558 "thread.cc", |
538 "thread.h", | 559 "thread.h", |
539 ] | 560 ] |
540 | 561 |
562 visibility = [ | |
563 ":rtc_base", | |
564 ":rtc_base_objc", | |
565 ] | |
566 | |
541 # TODO(henrike): issue 3307, make rtc_base build with the Chromium default | 567 # TODO(henrike): issue 3307, make rtc_base build with the Chromium default |
542 # compiler settings. | 568 # compiler settings. |
543 suppressed_configs += [ "//build/config/compiler:chromium_code" ] | 569 suppressed_configs += [ "//build/config/compiler:chromium_code" ] |
544 configs += [ "//build/config/compiler:no_chromium_code" ] | 570 configs += [ "//build/config/compiler:no_chromium_code" ] |
545 if (!is_win) { | 571 if (!is_win) { |
546 cflags += [ "-Wno-uninitialized" ] | 572 cflags += [ "-Wno-uninitialized" ] |
547 } | 573 } |
548 | 574 |
549 if (build_with_chromium) { | 575 if (build_with_chromium) { |
550 if (is_win) { | 576 if (is_win) { |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
590 "ifaddrs-android.h", | 616 "ifaddrs-android.h", |
591 ] | 617 ] |
592 | 618 |
593 libs += [ | 619 libs += [ |
594 "log", | 620 "log", |
595 "GLESv2", | 621 "GLESv2", |
596 ] | 622 ] |
597 } | 623 } |
598 | 624 |
599 if (is_ios || is_mac) { | 625 if (is_ios || is_mac) { |
600 sources += [ | 626 sources += [ "macifaddrs_converter.cc" ] |
601 "macifaddrs_converter.cc", | |
602 "thread_darwin.mm", | |
603 ] | |
604 } | 627 } |
605 | 628 |
606 if (use_x11) { | 629 if (use_x11) { |
607 libs += [ | 630 libs += [ |
608 "dl", | 631 "dl", |
609 "rt", | 632 "rt", |
610 "Xext", | 633 "Xext", |
611 "X11", | 634 "X11", |
612 "Xcomposite", | 635 "Xcomposite", |
613 "Xrender", | 636 "Xrender", |
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1074 "java/src/org/webrtc/ContextUtils.java", | 1097 "java/src/org/webrtc/ContextUtils.java", |
1075 "java/src/org/webrtc/Logging.java", | 1098 "java/src/org/webrtc/Logging.java", |
1076 "java/src/org/webrtc/Size.java", | 1099 "java/src/org/webrtc/Size.java", |
1077 "java/src/org/webrtc/ThreadUtils.java", | 1100 "java/src/org/webrtc/ThreadUtils.java", |
1078 ] | 1101 ] |
1079 | 1102 |
1080 # TODO(sakal): Fix build hooks crbug.com/webrtc/8148 | 1103 # TODO(sakal): Fix build hooks crbug.com/webrtc/8148 |
1081 no_build_hooks = true | 1104 no_build_hooks = true |
1082 } | 1105 } |
1083 } | 1106 } |
OLD | NEW |