chromium/src
0
Fork 0
Code Activity

jingle: inline gypi file into BUILD.gn file

Browse Source 
Remove jingle.gypi as it is not necessary to share the list of source
files between GYP and GN anymore.

BUG=None
R=sergeyu@chromium.org,dpranke@chromium.org

Review-Url: https://codereview.chromium.org/2475483003
Cr-Commit-Position: refs/heads/master@{#429691}
This commit is contained in:
tfarina
2016-11-03 13:50:16 -07:00
committed by Commit bot
parent bc29809b85
commit e35da66e69
2 changed files with 17 additions and 31 deletions

23
jingle/BUILD.gn

@ -6,13 +6,24 @@ import("//build/config/features.gni")
import("//testing/test.gni")
if (enable_webrtc || !is_android) {
jingle_includes = exec_script("//build/gypi_to_gn.py",
[ rebase_path("jingle.gypi") ],
"scope",
[ "jingle.gypi" ])
static_library("jingle_glue") {
sources = jingle_includes.jingle_glue_sources
sources = [
"glue/chrome_async_socket.cc",
"glue/chrome_async_socket.h",
"glue/fake_ssl_client_socket.cc",
"glue/fake_ssl_client_socket.h",
"glue/proxy_resolving_client_socket.cc",
"glue/proxy_resolving_client_socket.h",
"glue/resolving_client_socket_factory.h",
"glue/task_pump.cc",
"glue/task_pump.h",
"glue/thread_wrapper.cc",
"glue/thread_wrapper.h",
"glue/utils.cc",
"glue/utils.h",
"glue/xmpp_client_socket_factory.cc",
"glue/xmpp_client_socket_factory.h",
]
public_deps = [
"//third_party/libjingle",
]

25
jingle/jingle.gypi

@ -1,25 +0,0 @@
# Copyright 2014 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.
{
'variables': {
'jingle_glue_sources': [
'glue/chrome_async_socket.cc',
'glue/chrome_async_socket.h',
'glue/fake_ssl_client_socket.cc',
'glue/fake_ssl_client_socket.h',
'glue/proxy_resolving_client_socket.cc',
'glue/proxy_resolving_client_socket.h',
'glue/resolving_client_socket_factory.h',
'glue/task_pump.cc',
'glue/task_pump.h',
'glue/thread_wrapper.cc',
'glue/thread_wrapper.h',
'glue/utils.cc',
'glue/utils.h',
'glue/xmpp_client_socket_factory.cc',
'glue/xmpp_client_socket_factory.h',
]
}
}