summaryrefslogtreecommitdiff
path: root/chromium/third_party/libjingle_xmpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-20 10:33:36 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-11-22 11:45:12 +0000
commitbe59a35641616a4cf23c4a13fa0632624b021c1b (patch)
tree9da183258bdf9cc413f7562079d25ace6955467f /chromium/third_party/libjingle_xmpp
parentd702e4b6a64574e97fc7df8fe3238cde70242080 (diff)
downloadqtwebengine-chromium-be59a35641616a4cf23c4a13fa0632624b021c1b.tar.gz
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/libjingle_xmpp')
-rw-r--r--chromium/third_party/libjingle_xmpp/BUILD.gn8
1 files changed, 7 insertions, 1 deletions
diff --git a/chromium/third_party/libjingle_xmpp/BUILD.gn b/chromium/third_party/libjingle_xmpp/BUILD.gn
index bf7495ec348..67df93e2ab2 100644
--- a/chromium/third_party/libjingle_xmpp/BUILD.gn
+++ b/chromium/third_party/libjingle_xmpp/BUILD.gn
@@ -12,6 +12,10 @@ group("libjingle_xmpp") {
]
}
+config("libjingle_xmpp_common_config") {
+ defines = [ "EXPAT_RELATIVE_PATH" ]
+}
+
rtc_static_library("rtc_task_runner") {
sources = [
"task_runner/task.cc",
@@ -47,6 +51,7 @@ rtc_static_library("rtc_xmllite") {
public_deps = [
"//third_party/expat",
]
+ all_dependent_configs = [ ":libjingle_xmpp_common_config" ]
}
config("rtc_xmpp_warnings_config") {
@@ -99,6 +104,7 @@ rtc_static_library("rtc_xmpp") {
"//third_party/expat",
]
configs += [ ":rtc_xmpp_warnings_config" ]
+ all_dependent_configs = [ ":libjingle_xmpp_common_config" ]
if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
@@ -131,9 +137,9 @@ rtc_test("libjingle_xmpp_unittests") {
deps = [
":libjingle_xmpp",
":rtc_task_runner",
-
"//base/test:run_all_unittests",
"//base/test:test_support",
+
# TODO(kjellander): Refactor/remove this dependency. It is needed by
# third_party/webrtc_overrides/webrtc/rtc_base/win32socketinit.cc.
"//net",