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

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

Issue 2985453002: Decoupling rtc_base from apple specific code [with cyclic deps] (Closed)
Patch Set: switching from public_deps to deps Created 3 years, 5 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 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_apple") {
kjellander_webrtc 2017/07/26 07:40:38 A name like objc_rtc_base is aligning better with
mbonadei 2017/07/26 07:47:19 Done.
402 check_includes = false
403 sources = [
404 "applefilesystem.mm",
405 "thread_darwin.mm",
406 ]
407
408 # We are explicitly disabling the check because we prefer to have a
409 # cyclic dependency instead of having to add an explicit dependency
410 # only for mac or ios on a lot of targets.
411 # deps = [ ":rtc_base" ]
412 }
413
401 rtc_static_library("rtc_base") { 414 rtc_static_library("rtc_base") {
402 cflags = [] 415 cflags = []
403 cflags_cc = [] 416 cflags_cc = []
404 libs = [] 417 libs = []
405 defines = [] 418 defines = []
406 deps = [ 419 deps = [
407 "..:webrtc_common", 420 "..:webrtc_common",
408 ] 421 ]
409 public_deps = [ 422 public_deps = [
410 ":rtc_base_approved", 423 ":rtc_base_approved",
411 ] 424 ]
412 public_configs = [] 425 public_configs = []
413 426
414 all_dependent_configs = [ ":rtc_base_all_dependent_config" ] 427 all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
415 428
416 sources = [ 429 sources = [
417 "applefilesystem.mm",
418 "asyncinvoker-inl.h", 430 "asyncinvoker-inl.h",
419 "asyncinvoker.cc", 431 "asyncinvoker.cc",
420 "asyncinvoker.h", 432 "asyncinvoker.h",
421 "asyncpacketsocket.cc", 433 "asyncpacketsocket.cc",
422 "asyncpacketsocket.h", 434 "asyncpacketsocket.h",
423 "asyncresolverinterface.cc", 435 "asyncresolverinterface.cc",
424 "asyncresolverinterface.h", 436 "asyncresolverinterface.h",
425 "asyncsocket.cc", 437 "asyncsocket.cc",
426 "asyncsocket.h", 438 "asyncsocket.h",
427 "asynctcpsocket.cc", 439 "asynctcpsocket.cc",
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 "ifaddrs-android.h", 572 "ifaddrs-android.h",
561 ] 573 ]
562 574
563 libs += [ 575 libs += [
564 "log", 576 "log",
565 "GLESv2", 577 "GLESv2",
566 ] 578 ]
567 } 579 }
568 580
569 if (is_ios || is_mac) { 581 if (is_ios || is_mac) {
570 sources += [ 582 sources += [ "macifaddrs_converter.cc" ]
571 "macifaddrs_converter.cc", 583 deps += [ ":rtc_base_apple" ]
572 "thread_darwin.mm",
573 ]
574 } 584 }
575 585
576 if (use_x11) { 586 if (use_x11) {
577 libs += [ 587 libs += [
578 "dl", 588 "dl",
579 "rt", 589 "rt",
580 "Xext", 590 "Xext",
581 "X11", 591 "X11",
582 "Xcomposite", 592 "Xcomposite",
583 "Xrender", 593 "Xrender",
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 if (is_android) { 1041 if (is_android) {
1032 android_library("base_java") { 1042 android_library("base_java") {
1033 java_files = [ 1043 java_files = [
1034 "java/src/org/webrtc/ContextUtils.java", 1044 "java/src/org/webrtc/ContextUtils.java",
1035 "java/src/org/webrtc/Logging.java", 1045 "java/src/org/webrtc/Logging.java",
1036 "java/src/org/webrtc/Size.java", 1046 "java/src/org/webrtc/Size.java",
1037 "java/src/org/webrtc/ThreadUtils.java", 1047 "java/src/org/webrtc/ThreadUtils.java",
1038 ] 1048 ]
1039 } 1049 }
1040 } 1050 }
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