Roll WebRTC 7546:7549.

remoting/remoting_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.
 
 {
   'includes': [
     '../native_client/build/untrusted.gypi',
     'remoting_srcs.gypi',
   ],
 
@@ skipping 137 matching lines @@
         'build_pnacl_newlib': 1,
         'extra_deps_pnacl_newlib': [
           '>(tc_lib_dir_pnacl_newlib)/libbase_i18n_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libbase_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libexpat_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libicudata_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libcrypto_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libicui18n_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libicuuc_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libjingle_nacl.a',
-          '>(tc_lib_dir_pnacl_newlib)/libjingle_p2p_constants_nacl.a',

[Jamie, 2014/10/16 00:31:39]

I'm surprised to see this deleted rather than modified. Where are we getting the
symbols from that we used to get from here?

[hellner1, 2014/10/16 14:45:50]

My mistake here. In the non-nacl, the different constants come from different
projects which removes the need for the workaround, however, nacl is still built
from one large target so it is still likely needed.

           '>(tc_lib_dir_pnacl_newlib)/libmedia_yuv_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libmodp_b64_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libboringssl_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libopus_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libppapi.a',
           '>(tc_lib_dir_pnacl_newlib)/libppapi_cpp.a',
           '>(tc_lib_dir_pnacl_newlib)/libprotobuf_lite_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libjingle_glue_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libnet_nacl.a',
           '>(tc_lib_dir_pnacl_newlib)/libremoting_client_plugin_lib_nacl.a',
@@ skipping 44 matching lines @@
         '-lnet_nacl',
         '-lcrypto_nacl',
         '-lbase_i18n_nacl',
         '-lbase_nacl',
         '-lurl_nacl',
 
         # Third-party libraries.
         '-lremoting_webrtc_nacl',
         '-lyuv_nacl',
         '-lvpx_nacl',
-        '-ljingle_p2p_constants_nacl',
         '-ljingle_nacl',
         '-lexpat_nacl',
         '-lmodp_b64_nacl',
         '-lopus_nacl',
         '-lboringssl_nacl',
         '-licui18n_nacl',
         '-licuuc_nacl',
         '-licudata_nacl',
         '-lprotobuf_lite_nacl',
         '-lwebm_nacl',
 
         # Base NaCl libraries.
         '-lppapi_cpp',
         '-lpthread',
         '-lnacl_io',
       ],
       'sources': [
         'client/plugin/pepper_module.cc',
       ],
     },  # end of target 'remoting_client_plugin_nacl'
   ]
 }