Roll WebRTC 7546:7549.

third_party/libjingle/libjingle_nacl.gyp

 # 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",
     'webrtc_base': "../webrtc/base",
     'webrtc_xmllite': "../webrtc/libjingle/xmllite",
+    'webrtc_p2p': "../webrtc/p2p",
   },
   'includes': [
     '../../native_client/build/untrusted.gypi',
   ],
   'targets': [
     {
       'target_name': 'libjingle_nacl',
       'type': 'none',
       'variables': {
         'nlib_target': 'libjingle_nacl.a',
@@ skipping 221 matching lines @@
         '<(webrtc_xmllite)/xmlelement.h',
         '<(webrtc_xmllite)/xmlnsstack.cc',
         '<(webrtc_xmllite)/xmlnsstack.h',
         '<(webrtc_xmllite)/xmlparser.cc',
         '<(webrtc_xmllite)/xmlparser.h',
         '<(webrtc_xmllite)/xmlprinter.cc',
         '<(webrtc_xmllite)/xmlprinter.h',
       ],
       'sources!': [
         # Compiled as part of libjingle_p2p_constants_nacl.
-        '<(libjingle_source)/talk/p2p/base/constants.cc',
-        '<(libjingle_source)/talk/p2p/base/constants.h',
+        '<(webrtc_p2p)/base/constants.cc',
+        '<(webrtc_p2p)/base/constants.h',
       ],
       'sources/': [
         ['exclude', '/mac[a-z]+\\.(h|cc)$'],
         ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
       ],
       'conditions': [
         ['OS!="win"', {
           'sources/': [
             ['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
             ['exclude', '/schanneladapter\\.(h|cc)$'],
@@ skipping 42 matching lines @@
             # _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',
+        '<(webrtc_p2p)/base/constants.cc',
+        '<(webrtc_p2p)/base/constants.h',
       ],
     },  # end of target 'libjingle_p2p_constants_nacl'
   ],
 }