Modify gyp files that depend on native_client/build/untrusted.gypi to specialize extra_deps for new…

ppapi/native_client/native_client.gyp

 # Copyright (c) 2011 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/common.gypi',
   ],
   'conditions': [
     ['disable_nacl==0 and disable_nacl_untrusted==0', {
@@ skipping 73 matching lines @@
                    '-Wt,-mtls-use-call',
                  ],
                },
              ],
             ],
             'sources': [
             ],
             'extra_args': [
               '--strip-debug',
             ],
+            # TODO(bradchen): get rid of extra_deps64 and extra_deps32
+            # once native_client/build/untrusted.gypi no longer needs them.
             'extra_deps64': [
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppruntime.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a',
             ],
             'extra_deps32': [
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppruntime.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a',
             ],
+            'extra_deps_newlib64': [
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppruntime.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libsrpc.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libplatform.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libimc_syscalls.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libgio.a',
+            ],
+            'extra_deps_newlib32': [
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppruntime.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libirt_browser.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libsrpc.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libplatform.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a',
+            ],
+            'extra_deps_glibc64': [
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppruntime.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libirt_browser.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libsrpc.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libplatform.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libimc_syscalls.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libgio.a',
+            ],
+            'extra_deps_glibc32': [
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppruntime.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libirt_browser.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libsrpc.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libplatform.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libimc_syscalls.a',
+              '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libgio.a',
+            ],
             'extra_deps_arm': [
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppruntime.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libirt_browser.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libsrpc.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libplatform.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libimc_syscalls.a',
               '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgio.a',
             ],
           },
           'dependencies': [
             'src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp:ppruntime_lib',
             '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
             '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
             '../../native_client/src/shared/platform/platform.gyp:platform_lib',
             '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
             '../../native_client/src/shared/gio/gio.gyp:gio_lib',
           ],
         },
       ],
     }],
   ],
 }