generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GN: Prepare to remove webrtc_base target

Browse Source 
Keep the webrtc_base target temporarily while waiting for
Chromium to pick up this revision. Then we'll update Chromium
and remove the webrtc_base target for real.

This should have been a part of https://code.google.com/p/webrtc/source/detail?r=7140

R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/33979004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8117 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2015-01-21 20:22:33 +00:00
parent c78d81ae89
commit c429b824b3
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/BUILD.gn
View File

@ -198,7 +198,7 @@ source_set("webrtc") {
deps = [ deps = [
":webrtc_common", ":webrtc_common",
"base:webrtc_base", "base:rtc_base",
"common_audio", "common_audio",
"common_video", "common_video",
"modules/audio_coding", "modules/audio_coding",

24
webrtc/base/BUILD.gn
View File

@ -10,7 +10,7 @@ import("//build/config/crypto.gni")
import("//build/config/ui.gni") import("//build/config/ui.gni")
import("../build/webrtc.gni") import("../build/webrtc.gni")
config("webrtc_base_config") { config("rtc_base_config") {
include_dirs = [ include_dirs = [
"//third_party/jsoncpp/overrides/include", "//third_party/jsoncpp/overrides/include",
"//third_party/jsoncpp/source/include", "//third_party/jsoncpp/source/include",
@ -22,12 +22,12 @@ config("webrtc_base_config") {
"USE_WEBRTC_DEV_BRANCH", "USE_WEBRTC_DEV_BRANCH",
] ]
# TODO(henrike): issue 3307, make webrtc_base build without disabling # TODO(henrike): issue 3307, make rtc_base build without disabling
# these flags. # these flags.
cflags_cc = [ "-Wno-non-virtual-dtor" ] cflags_cc = [ "-Wno-non-virtual-dtor" ]
} }
config("webrtc_base_chromium_config") { config("rtc_base_chromium_config") {
defines = [ defines = [
"NO_MAIN_THREAD_WRAPPING", "NO_MAIN_THREAD_WRAPPING",
] ]
@ -126,7 +126,15 @@ static_library("rtc_base_approved") {
] ]
} }
static_library("webrtc_base") { # Temporary target until Chromium's use of webrtc_base is updated to rtc_base.
# TODO(kjellander): Remove when this is rolled into Chromium's DEPS.
group("webrtc_base") {
deps = [
":rtc_base",
]
}
static_library("rtc_base") {
cflags = [] cflags = []
cflags_cc = [] cflags_cc = []
libs = [] libs = []
@ -136,12 +144,12 @@ static_library("webrtc_base") {
configs += [ configs += [
"..:common_config", "..:common_config",
":webrtc_base_config", ":rtc_base_config",
] ]
public_configs = [ public_configs = [
"..:common_inherited_config", "..:common_inherited_config",
":webrtc_base_config", ":rtc_base_config",
] ]
defines = [ defines = [
@ -310,7 +318,7 @@ static_library("webrtc_base") {
"../../boringssl/src/include", "../../boringssl/src/include",
] ]
public_configs += [ ":webrtc_base_chromium_config" ] public_configs += [ ":rtc_base_chromium_config" ]
} else { } else {
sources += [ sources += [
"asyncinvoker.cc", "asyncinvoker.cc",
@ -441,7 +449,7 @@ static_library("webrtc_base") {
configs -= [ "//build/config/clang:find_bad_constructs" ] configs -= [ "//build/config/clang:find_bad_constructs" ]
} }
# TODO(henrike): issue 3307, make webrtc_base build with the Chromium default # TODO(henrike): issue 3307, make rtc_base build with the Chromium default
# compiler settings. # compiler settings.
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ]

2
webrtc/modules/desktop_capture/BUILD.gn
View File

@ -127,8 +127,8 @@ source_set("desktop_capture") {
} }
deps = [ deps = [
"../../base:rtc_base_approved",
"../../system_wrappers", "../../system_wrappers",
"../../base:webrtc_base",
] ]
if (use_desktop_capture_differ_sse2) { if (use_desktop_capture_differ_sse2) {