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

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

Issue 3001623003: Decoupling rtc_base from Obj-C code (Closed)
Patch Set: Adding comments to explain the noop.{cc,mm} trick Created 3 years, 4 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 | webrtc/rtc_base/noop.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 import("//build/config/crypto.gni") 9 import("//build/config/crypto.gni")
10 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 ] 391 ]
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") {
kwiberg-webrtc 2017/08/31 20:46:14 If you made this a source set, would the need for
mbonadei 2017/09/01 09:24:35 In the next patch set I have switched to rtc_sourc
kwiberg-webrtc 2017/09/01 11:23:44 The default Chromium advice is to use a source set
402 if (is_ios || is_mac) {
403 # In order to build a static_library targeting macOS or iOS
404 # we have to provide at least one source file to avoid a build
405 # error.
406 sources = [
407 "noop.mm",
408 ]
409 public_deps = [
410 ":rtc_base_objc",
411 ]
412 } else {
413 # In order to build a static_library targeting macOS or iOS
414 # we have to provide at least one source file to avoid a build
415 # error.
416 sources = [
417 "noop.cc",
418 ]
kwiberg-webrtc 2017/08/31 20:46:14 I'm confused. In the else clause, we *aren't* on m
mbonadei 2017/09/01 09:24:35 Oh wait... Yes you are right! In similar CLs I avo
419 public_deps = [
420 ":rtc_base_generic",
421 ]
kwiberg-webrtc 2017/08/31 20:46:14 This one could be lifted out of the if-else, right
mbonadei 2017/09/01 09:24:36 This is the right thing to do. I was too focused o
422 }
423 }
424
425 if (is_ios || is_mac) {
426 rtc_static_library("rtc_base_objc") {
427 sources = [
428 "applefilesystem.mm",
429 "thread_darwin.mm",
430 ]
431 public_deps = [
432 ":rtc_base_generic",
433 ]
434 visibility = [ ":rtc_base" ]
435 }
436 }
437
438 rtc_static_library("rtc_base_generic") {
402 cflags = [] 439 cflags = []
403 cflags_cc = [] 440 cflags_cc = []
404 libs = [] 441 libs = []
405 defines = [] 442 defines = []
406 deps = [ 443 deps = [
407 "..:webrtc_common", 444 "..:webrtc_common",
408 ] 445 ]
409 public_deps = [ 446 public_deps = [
410 ":rtc_base_approved", 447 ":rtc_base_approved",
411 ] 448 ]
412 public_configs = [] 449 public_configs = []
413 450
414 all_dependent_configs = [ ":rtc_base_all_dependent_config" ] 451 all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
415 452
416 sources = [ 453 sources = [
417 "applefilesystem.mm",
418 "asyncinvoker-inl.h", 454 "asyncinvoker-inl.h",
419 "asyncinvoker.cc", 455 "asyncinvoker.cc",
420 "asyncinvoker.h", 456 "asyncinvoker.h",
421 "asyncpacketsocket.cc", 457 "asyncpacketsocket.cc",
422 "asyncpacketsocket.h", 458 "asyncpacketsocket.h",
423 "asyncresolverinterface.cc", 459 "asyncresolverinterface.cc",
424 "asyncresolverinterface.h", 460 "asyncresolverinterface.h",
425 "asyncsocket.cc", 461 "asyncsocket.cc",
426 "asyncsocket.h", 462 "asyncsocket.h",
427 "asynctcpsocket.cc", 463 "asynctcpsocket.cc",
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 "sslidentity.cc", 537 "sslidentity.cc",
502 "sslidentity.h", 538 "sslidentity.h",
503 "sslstreamadapter.cc", 539 "sslstreamadapter.cc",
504 "sslstreamadapter.h", 540 "sslstreamadapter.h",
505 "stream.cc", 541 "stream.cc",
506 "stream.h", 542 "stream.h",
507 "thread.cc", 543 "thread.cc",
508 "thread.h", 544 "thread.h",
509 ] 545 ]
510 546
547 visibility = [
548 ":rtc_base",
549 ":rtc_base_objc",
550 ]
551
511 # TODO(henrike): issue 3307, make rtc_base build with the Chromium default 552 # TODO(henrike): issue 3307, make rtc_base build with the Chromium default
512 # compiler settings. 553 # compiler settings.
513 suppressed_configs += [ "//build/config/compiler:chromium_code" ] 554 suppressed_configs += [ "//build/config/compiler:chromium_code" ]
514 configs += [ "//build/config/compiler:no_chromium_code" ] 555 configs += [ "//build/config/compiler:no_chromium_code" ]
515 if (!is_win) { 556 if (!is_win) {
516 cflags += [ "-Wno-uninitialized" ] 557 cflags += [ "-Wno-uninitialized" ]
517 } 558 }
518 559
519 if (build_with_chromium) { 560 if (build_with_chromium) {
520 if (is_win) { 561 if (is_win) {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 "ifaddrs-android.h", 601 "ifaddrs-android.h",
561 ] 602 ]
562 603
563 libs += [ 604 libs += [
564 "log", 605 "log",
565 "GLESv2", 606 "GLESv2",
566 ] 607 ]
567 } 608 }
568 609
569 if (is_ios || is_mac) { 610 if (is_ios || is_mac) {
570 sources += [ 611 sources += [ "macifaddrs_converter.cc" ]
571 "macifaddrs_converter.cc",
572 "thread_darwin.mm",
573 ]
574 } 612 }
575 613
576 if (use_x11) { 614 if (use_x11) {
577 libs += [ 615 libs += [
578 "dl", 616 "dl",
579 "rt", 617 "rt",
580 "Xext", 618 "Xext",
581 "X11", 619 "X11",
582 "Xcomposite", 620 "Xcomposite",
583 "Xrender", 621 "Xrender",
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 if (is_android) { 1069 if (is_android) {
1032 android_library("base_java") { 1070 android_library("base_java") {
1033 java_files = [ 1071 java_files = [
1034 "java/src/org/webrtc/ContextUtils.java", 1072 "java/src/org/webrtc/ContextUtils.java",
1035 "java/src/org/webrtc/Logging.java", 1073 "java/src/org/webrtc/Logging.java",
1036 "java/src/org/webrtc/Size.java", 1074 "java/src/org/webrtc/Size.java",
1037 "java/src/org/webrtc/ThreadUtils.java", 1075 "java/src/org/webrtc/ThreadUtils.java",
1038 ] 1076 ]
1039 } 1077 }
1040 } 1078 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/rtc_base/noop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698