summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 03:49:12 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 03:49:12 +0000
commitbae528e3bf0d6f9a0456676abd26d9eaeff077ef (patch)
treedd4717bf600da86079a52a6f4f3abf19dd4ebcea /jingle
parent827237bbd96c827040119460ec681549298e12ed (diff)
downloadchromium_src-bae528e3bf0d6f9a0456676abd26d9eaeff077ef.zip
chromium_src-bae528e3bf0d6f9a0456676abd26d9eaeff077ef.tar.gz
chromium_src-bae528e3bf0d6f9a0456676abd26d9eaeff077ef.tar.bz2
Compile jingle_glue for PNaCl
The new target jingle_glue_nacl compiles jingle/glue for PNaCl BUG=276739 Review URL: https://codereview.chromium.org/208333011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/jingle.gyp23
-rw-r--r--jingle/jingle.gypi29
-rw-r--r--jingle/jingle_nacl.gyp38
3 files changed, 71 insertions, 19 deletions
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index b2e9f76..8ccda5d 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -3,6 +3,9 @@
# found in the LICENSE file.
{
+ 'includes': [
+ 'jingle.gypi',
+ ],
'variables': {
'chromium_code': 1,
}, # variables
@@ -14,25 +17,7 @@
'target_name': 'jingle_glue',
'type': 'static_library',
'sources': [
- 'glue/channel_socket_adapter.cc',
- 'glue/channel_socket_adapter.h',
- '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/pseudotcp_adapter.cc',
- 'glue/pseudotcp_adapter.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',
+ '<@(jingle_glue_sources)',
],
'dependencies': [
'../base/base.gyp:base',
diff --git a/jingle/jingle.gypi b/jingle/jingle.gypi
new file mode 100644
index 0000000..eb74bbc
--- /dev/null
+++ b/jingle/jingle.gypi
@@ -0,0 +1,29 @@
+# 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/channel_socket_adapter.cc',
+ 'glue/channel_socket_adapter.h',
+ '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/pseudotcp_adapter.cc',
+ 'glue/pseudotcp_adapter.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',
+ ]
+ }
+}
diff --git a/jingle/jingle_nacl.gyp b/jingle/jingle_nacl.gyp
new file mode 100644
index 0000000..13f9ff1
--- /dev/null
+++ b/jingle/jingle_nacl.gyp
@@ -0,0 +1,38 @@
+# 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': {
+ 'chromium_code': 1,
+ },
+ 'includes': [
+ '../native_client/build/untrusted.gypi',
+ 'jingle.gypi',
+ ],
+ 'targets': [
+ {
+ 'target_name': 'jingle_glue_nacl',
+ 'type': 'none',
+ 'variables': {
+ 'nacl_untrusted_build': 1,
+ 'nlib_target': 'libjingle_glue_nacl.a',
+ 'build_glibc': 0,
+ 'build_newlib': 0,
+ 'build_pnacl_newlib': 1,
+ },
+ 'sources': [
+ '<@(jingle_glue_sources)',
+ ],
+ 'dependencies': [
+ '../base/base_nacl.gyp:base_nacl',
+ '../native_client/tools.gyp:prep_toolchain',
+ '../net/net_nacl.gyp:net_nacl',
+ '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
+ ],
+ 'export_dependent_settings': [
+ '../third_party/libjingle/libjingle_nacl.gyp:libjingle_nacl',
+ ],
+ }
+ ]
+}