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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
392 } else { | 392 } else { |
393 include_dirs = [ "$rtc_jsoncpp_root" ] | 393 include_dirs = [ "$rtc_jsoncpp_root" ] |
394 | 394 |
395 # When defined changes the include path for json.h to where it is | 395 # When defined changes the include path for json.h to where it is |
396 # expected to be when building json outside of the standalone build. | 396 # expected to be when building json outside of the standalone build. |
397 defines += [ "WEBRTC_EXTERNAL_JSON" ] | 397 defines += [ "WEBRTC_EXTERNAL_JSON" ] |
398 } | 398 } |
399 } | 399 } |
400 | 400 |
401 rtc_static_library("rtc_base") { | 401 rtc_static_library("rtc_base") { |
402 if (is_ios || is_mac) { | |
403 sources = [ | |
404 "noop.mm", | |
405 ] | |
406 public_deps = [ | |
407 ":objc_rtc_base", | |
408 ] | |
409 } else { | |
410 sources = [ | |
411 "noop.cc", | |
412 ] | |
413 public_deps = [ | |
414 ":rtc_base_generic", | |
415 ] | |
416 } | |
417 } | |
418 | |
419 rtc_static_library("objc_rtc_base") { | |
kjellander_webrtc
2017/08/14 14:00:36
How about rtc_base_objc?
mbonadei
2017/08/14 15:07:34
Seems good to me. I also prefer the _objc suffix (
| |
420 sources = [ | |
421 "applefilesystem.mm", | |
422 "thread_darwin.mm", | |
423 ] | |
424 public_deps = [ | |
425 ":rtc_base_generic", | |
426 ] | |
427 visibility = [ ":rtc_base" ] | |
428 } | |
429 | |
430 rtc_static_library("rtc_base_generic") { | |
402 cflags = [] | 431 cflags = [] |
403 cflags_cc = [] | 432 cflags_cc = [] |
404 libs = [] | 433 libs = [] |
405 defines = [] | 434 defines = [] |
406 deps = [ | 435 deps = [ |
407 "..:webrtc_common", | 436 "..:webrtc_common", |
408 ] | 437 ] |
409 public_deps = [ | 438 public_deps = [ |
410 ":rtc_base_approved", | 439 ":rtc_base_approved", |
411 ] | 440 ] |
412 public_configs = [] | 441 public_configs = [] |
413 | 442 |
414 all_dependent_configs = [ ":rtc_base_all_dependent_config" ] | 443 all_dependent_configs = [ ":rtc_base_all_dependent_config" ] |
415 | 444 |
416 sources = [ | 445 sources = [ |
417 "applefilesystem.mm", | |
418 "asyncinvoker-inl.h", | 446 "asyncinvoker-inl.h", |
419 "asyncinvoker.cc", | 447 "asyncinvoker.cc", |
420 "asyncinvoker.h", | 448 "asyncinvoker.h", |
421 "asyncpacketsocket.cc", | 449 "asyncpacketsocket.cc", |
422 "asyncpacketsocket.h", | 450 "asyncpacketsocket.h", |
423 "asyncresolverinterface.cc", | 451 "asyncresolverinterface.cc", |
424 "asyncresolverinterface.h", | 452 "asyncresolverinterface.h", |
425 "asyncsocket.cc", | 453 "asyncsocket.cc", |
426 "asyncsocket.h", | 454 "asyncsocket.h", |
427 "asynctcpsocket.cc", | 455 "asynctcpsocket.cc", |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
501 "sslidentity.cc", | 529 "sslidentity.cc", |
502 "sslidentity.h", | 530 "sslidentity.h", |
503 "sslstreamadapter.cc", | 531 "sslstreamadapter.cc", |
504 "sslstreamadapter.h", | 532 "sslstreamadapter.h", |
505 "stream.cc", | 533 "stream.cc", |
506 "stream.h", | 534 "stream.h", |
507 "thread.cc", | 535 "thread.cc", |
508 "thread.h", | 536 "thread.h", |
509 ] | 537 ] |
510 | 538 |
539 visibility = [ | |
kjellander_webrtc
2017/08/14 14:00:36
How about
visibility = [ ":*" ]
to make maintenan
mbonadei
2017/08/14 15:07:34
I would like to keep it as private as possible bec
kjellander_webrtc
2017/08/15 08:40:58
Fair enough.
| |
540 ":rtc_base", | |
541 ":objc_rtc_base", | |
542 ] | |
543 | |
511 # TODO(henrike): issue 3307, make rtc_base build with the Chromium default | 544 # TODO(henrike): issue 3307, make rtc_base build with the Chromium default |
512 # compiler settings. | 545 # compiler settings. |
513 suppressed_configs += [ "//build/config/compiler:chromium_code" ] | 546 suppressed_configs += [ "//build/config/compiler:chromium_code" ] |
514 configs += [ "//build/config/compiler:no_chromium_code" ] | 547 configs += [ "//build/config/compiler:no_chromium_code" ] |
515 if (!is_win) { | 548 if (!is_win) { |
516 cflags += [ "-Wno-uninitialized" ] | 549 cflags += [ "-Wno-uninitialized" ] |
517 } | 550 } |
518 | 551 |
519 if (build_with_chromium) { | 552 if (build_with_chromium) { |
520 if (is_win) { | 553 if (is_win) { |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
560 "ifaddrs-android.h", | 593 "ifaddrs-android.h", |
561 ] | 594 ] |
562 | 595 |
563 libs += [ | 596 libs += [ |
564 "log", | 597 "log", |
565 "GLESv2", | 598 "GLESv2", |
566 ] | 599 ] |
567 } | 600 } |
568 | 601 |
569 if (is_ios || is_mac) { | 602 if (is_ios || is_mac) { |
570 sources += [ | 603 sources += [ "macifaddrs_converter.cc" ] |
571 "macifaddrs_converter.cc", | |
572 "thread_darwin.mm", | |
573 ] | |
574 } | 604 } |
575 | 605 |
576 if (use_x11) { | 606 if (use_x11) { |
577 libs += [ | 607 libs += [ |
578 "dl", | 608 "dl", |
579 "rt", | 609 "rt", |
580 "Xext", | 610 "Xext", |
581 "X11", | 611 "X11", |
582 "Xcomposite", | 612 "Xcomposite", |
583 "Xrender", | 613 "Xrender", |
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1031 if (is_android) { | 1061 if (is_android) { |
1032 android_library("base_java") { | 1062 android_library("base_java") { |
1033 java_files = [ | 1063 java_files = [ |
1034 "java/src/org/webrtc/ContextUtils.java", | 1064 "java/src/org/webrtc/ContextUtils.java", |
1035 "java/src/org/webrtc/Logging.java", | 1065 "java/src/org/webrtc/Logging.java", |
1036 "java/src/org/webrtc/Size.java", | 1066 "java/src/org/webrtc/Size.java", |
1037 "java/src/org/webrtc/ThreadUtils.java", | 1067 "java/src/org/webrtc/ThreadUtils.java", |
1038 ] | 1068 ] |
1039 } | 1069 } |
1040 } | 1070 } |
OLD | NEW |