GN: Prepare to remove webrtc_base target
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
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index ea14644..2978b56 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -198,7 +198,7 @@
deps = [
":webrtc_common",
- "base:webrtc_base",
+ "base:rtc_base",
"common_audio",
"common_video",
"modules/audio_coding",
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 3bc10bd..b512347 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -10,7 +10,7 @@
import("//build/config/ui.gni")
import("../build/webrtc.gni")
-config("webrtc_base_config") {
+config("rtc_base_config") {
include_dirs = [
"//third_party/jsoncpp/overrides/include",
"//third_party/jsoncpp/source/include",
@@ -22,12 +22,12 @@
"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.
cflags_cc = [ "-Wno-non-virtual-dtor" ]
}
-config("webrtc_base_chromium_config") {
+config("rtc_base_chromium_config") {
defines = [
"NO_MAIN_THREAD_WRAPPING",
]
@@ -126,7 +126,15 @@
]
}
-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_cc = []
libs = []
@@ -136,12 +144,12 @@
configs += [
"..:common_config",
- ":webrtc_base_config",
+ ":rtc_base_config",
]
public_configs = [
"..:common_inherited_config",
- ":webrtc_base_config",
+ ":rtc_base_config",
]
defines = [
@@ -310,7 +318,7 @@
"../../boringssl/src/include",
]
- public_configs += [ ":webrtc_base_chromium_config" ]
+ public_configs += [ ":rtc_base_chromium_config" ]
} else {
sources += [
"asyncinvoker.cc",
@@ -441,7 +449,7 @@
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.
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
diff --git a/webrtc/modules/desktop_capture/BUILD.gn b/webrtc/modules/desktop_capture/BUILD.gn
index d8447b1..65bf908 100644
--- a/webrtc/modules/desktop_capture/BUILD.gn
+++ b/webrtc/modules/desktop_capture/BUILD.gn
@@ -127,8 +127,8 @@
}
deps = [
+ "../../base:rtc_base_approved",
"../../system_wrappers",
- "../../base:webrtc_base",
]
if (use_desktop_capture_differ_sse2) {
