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

Unified Diff: third_party/webrtc_overrides/BUILD.gn

Issue 2413103004: Remove third_party/libjingle and update GN targets. (Closed)
Patch Set: Fix rebase mistake Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libjingle/webrtc/BUILD.gn ('k') | tools/ipc_fuzzer/message_lib/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/webrtc_overrides/BUILD.gn
diff --git a/third_party/libjingle/BUILD.gn b/third_party/webrtc_overrides/BUILD.gn
similarity index 58%
rename from third_party/libjingle/BUILD.gn
rename to third_party/webrtc_overrides/BUILD.gn
index 2c8da94c550a32d6e551050cdcbd2815ccb99aca..5f5e67dd96fcba7badba234f982ad01835f5e5ad 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/webrtc_overrides/BUILD.gn
@@ -1,8 +1,12 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2017 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/features.gni")
+group("webrtc_overrides") {
+ public_deps = [
+ ":webrtc",
+ ]
+}
config("jingle_unexported_configs") {
include_dirs = [
@@ -33,7 +37,7 @@ group("jingle_deps") {
]
}
-static_library("libjingle") {
+static_library("webrtc") {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
@@ -50,7 +54,6 @@ static_library("libjingle") {
"//third_party/webrtc/p2p:rtc_p2p",
]
- # From libjingle_common.gypi's conditions list.
if (is_win) {
cflags = [ "/wd4005" ]
}
@@ -64,7 +67,7 @@ static_library("libjingle") {
} else {
# Otherwise, we just add the field_trial which redirects to base.
sources = [
- "../webrtc_overrides/field_trial.cc",
+ "field_trial.cc",
]
}
@@ -77,3 +80,46 @@ static_library("libjingle") {
"//third_party/webrtc:common_inherited_config",
]
}
+
+static_library("init_webrtc") {
+ sources = [
+ "init_webrtc.cc",
+ "init_webrtc.h",
+ ]
+ configs += [
+ ":jingle_unexported_configs",
+ "//third_party/webrtc:common_config",
+ ]
+ public_configs = [
+ ":jingle_public_configs",
+ "//third_party/webrtc:common_inherited_config",
+ ]
+ public_deps = [
+ ":libjingle_webrtc_common",
+ ]
+}
+
+source_set("libjingle_webrtc_common") {
+ configs += [
+ ":jingle_unexported_configs",
+ "//third_party/webrtc:common_config",
+ ]
+ public_configs = [
+ ":jingle_public_configs",
+ "//third_party/webrtc:common_inherited_config",
+ ]
+
+ deps = [
+ ":webrtc",
+ "//third_party/libsrtp",
+ "//third_party/usrsctp",
+ "//third_party/webrtc/api:libjingle_peerconnection",
+ "//third_party/webrtc/media:rtc_media",
+ "//third_party/webrtc/media:rtc_media_base",
+ "//third_party/webrtc/modules/media_file",
+ "//third_party/webrtc/modules/video_capture",
+ "//third_party/webrtc/pc:rtc_pc",
+ "//third_party/webrtc/system_wrappers",
+ "//third_party/webrtc/voice_engine",
+ ]
+}
« no previous file with comments | « third_party/libjingle/webrtc/BUILD.gn ('k') | tools/ipc_fuzzer/message_lib/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698