Compile libjingle for PNaCl

third_party/libjingle/libjingle_nacl.gyp

Index: third_party/libjingle/libjingle_nacl.gyp
diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp
new file mode 100644
index 0000000000000000000000000000000000000000..b0a2c6f19597749cc56914bba65f268593ba03c5
--- /dev/null
+++ b/third_party/libjingle/libjingle_nacl.gyp
@@ -0,0 +1,115 @@
+# 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': {
+    'libjingle_source%': "source",
+  },
+  'includes': [
+    '../../native_client/build/untrusted.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'libjingle_nacl',
+      'type': 'none',
+      'variables': {
+        'nlib_target': 'libjingle_nacl.a',
+        'nacl_untrusted_build': 1,
+        'build_glibc': 0,
+        'build_newlib': 0,

[Ronghua Wu (Left Chromium), 2014/02/21 16:51:17]

assume this change is intended.

[Sergey Ulanov, 2014/02/21 19:49:19]

Yes. Since we are going to use PNaCl build, but not NaCl, it doesn't make sense
to build libjingle for NaCl at this point.

+        'build_pnacl_newlib': 1,
+        'use_openssl': 1,
+      },
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+        '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
+        '<(DEPTH)/third_party/expat/expat_nacl.gyp:expat_nacl',
+        '<(DEPTH)/third_party/openssl/openssl_nacl.gyp:openssl_nacl',
+        'libjingle_p2p_constants_nacl',
+      ],
+      'defines': [
+        'EXPAT_RELATIVE_PATH',
+        'FEATURE_ENABLE_SSL',
+        'GTEST_RELATIVE_PATH',
+        'HAVE_OPENSSL_SSL_H',
+        'NO_MAIN_THREAD_WRAPPING',
+        'NO_SOUND_SYSTEM',
+        'POSIX',
+        'SRTP_RELATIVE_PATH',
+        'SSL_USE_OPENSSL',
+        'USE_WEBRTC_DEV_BRANCH',
+        'timezone=_timezone',
+      ],
+      'configurations': {
+        'Debug': {
+          'defines': [
+            # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
+            # _DEBUG and remove this define. See below as well.
+            '_DEBUG',
+          ],
+        }
+      },
+      'include_dirs': [
+        '../testing/gtest/include',
+        './<(libjingle_source)',
+      ],
+      'includes': ['libjingle_srcs.gypi', ],
+      'sources!': [
+        # Compiled as part of libjingle_p2p_constants_nacl.
+        '<(libjingle_source)/talk/p2p/base/constants.cc',
+        '<(libjingle_source)/talk/p2p/base/constants.h',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          './overrides',
+          './<(libjingle_source)',
+          '../../testing/gtest/include',
+          '../../third_party',
+          '../../third_party/webrtc',
+        ],
+        'defines': [
+          'EXPAT_RELATIVE_PATH',
+          'FEATURE_ENABLE_SSL',
+          'GTEST_RELATIVE_PATH',
+          'NO_MAIN_THREAD_WRAPPING',
+          'NO_SOUND_SYSTEM',
+          'POSIX',
+          'SRTP_RELATIVE_PATH',
+          'SSL_USE_OPENSSL',
+          'USE_WEBRTC_DEV_BRANCH',

[Ronghua Wu (Left Chromium), 2014/02/21 16:51:17]

Can we move these to the include file as well?

Maybe change libjingle_srcs.gypi to libjingle_common.gypi

[Sergey Ulanov, 2014/02/21 19:49:19]

I did look into that. Problem is that libjingle.gyp has multiple targets and the
defines list is in target_defaults. The gypi file is included for only one of
them. Beside that the set of defines we need here is different from what's
defined in libjingle.gyp. The current approach is the simplest and cleanest I
can see.
Done.

[Ronghua Wu (Left Chromium), 2014/02/21 19:55:13]

I thought we can define the list of the source as a variable (e.g.
libjingle_srcs) and used it in the source file for the 2 libjingle libs.

Then you can include libjingle_common.gypi on top of
libjingle/libjingle_nacl.gyp. And do something like this for the 2 libjingle
libs.
sources': [ <(libjingle_srcs) ]

But if this is not possible for some reason, I'm fine with current approach.

+        ],
+      },
+      'export_dependent_settings': [
+        '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
+      ],
+    },  # end of target 'libjingle_nacl'
+
+    {
+      'target_name': 'libjingle_p2p_constants_nacl',
+      'type': 'none',
+      'variables': {
+        'nlib_target': 'libjingle_p2p_constants_nacl.a',
+        'build_glibc': 0,
+        'build_newlib': 1,
+        'build_pnacl_newlib': 1,
+      },
+      'configurations': {
+        'Debug': {
+          'defines': [
+            # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
+            # _DEBUG and remove this define. See below as well.
+            '_DEBUG',
+          ],
+        }
+      },
+      'include_dirs': [
+        './<(libjingle_source)',
+      ],
+      'sources': [
+        '<(libjingle_source)/talk/p2p/base/constants.cc',
+        '<(libjingle_source)/talk/p2p/base/constants.h',
+      ],
+    },  # end of target 'libjingle_p2p_constants_nacl'
+  ],
+}