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

Unified Diff: jingle/BUILD.gn

Issue 455583002: Port parts of //third_pary/libjingle build to GN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another rebase Created 6 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 side-by-side diff with in-line comments
Download patch
Index: jingle/BUILD.gn
diff --git a/jingle/BUILD.gn b/jingle/BUILD.gn
index 5b8e96cc569def16f0f0e63628f657dbc7618ff8..04bfdb734b2c494dfcc2a215024363c3604b1c8e 100644
--- a/jingle/BUILD.gn
+++ b/jingle/BUILD.gn
@@ -17,14 +17,9 @@ if (enable_webrtc || !is_android) {
"//base",
"//base/third_party/dynamic_annotations",
"//net",
- # '../third_party/libjingle/libjingle.gyp:libjingle', # TODO(GYP)
+ "//third_party/libjingle",
]
- # 'export_dependent_settings': [
- # '../third_party/libjingle/libjingle.gyp:libjingle',
- # ],
-
- # TODO(GYP): Replace this with a proper dependency on libjingle.
- direct_dependent_configs = [ "//content:libjingle_stub_config", ]
+ forward_dependent_configs_from = [ "//third_party/libjingle" ]
}
# A library for sending and receiving peer-issued notifications.
@@ -88,13 +83,9 @@ if (enable_webrtc || !is_android) {
"//third_party/expat",
"//url",
":jingle_glue",
- # '../third_party/libjingle/libjingle.gyp:libjingle', # TODO(GYP)
+ "//third_party/libjingle",
]
- # 'export_dependent_settings': [
- # '../third_party/libjingle/libjingle.gyp:libjingle',
- # ],
- # TODO(GYP): Replace this with a proper dependency on libjingle.
- direct_dependent_configs = [ "//content:libjingle_stub_config", ]
+ forward_dependent_configs_from = [ "//third_party/libjingle" ]
}
# GYP version: jingle/jingle.gyp:notifier_test_util
@@ -166,13 +157,9 @@ if (enable_webrtc || !is_android) {
"//net:test_support",
"//testing/gmock",
"//testing/gtest",
- # '../third_party/libjingle/libjingle.gyp:libjingle', # TODO(GYP)
+ "//third_party/libjingle",
]
- # 'export_dependent_settings': [
- # '../third_party/libjingle/libjingle.gyp:libjingle',
- # ],
- # TODO(GYP): Replace this with a proper dependency on libjingle.
- direct_dependent_configs = [ "//content:libjingle_stub_config", ]
+ forward_dependent_configs_from = [ "//third_party/libjingle" ]
}
} else {
# !enable_webrtc and is_android

Powered by Google App Engine
This is Rietveld 408576698