Modify gyp files that depend on native_client/build/untrusted.gypi to...

Modify gyp files that depend on native_client/build/untrusted.gypi to specialize extra_deps for newlib and glibc.

BUG=127699
TEST=browser_tests (build)

Review URL: https://chromiumcodereview.appspot.com/10409059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138339 0039d316-1c4b-4281-b951-d872f2087c98

ppapi/native_client/native_client.gyp

@@ -91,6 +91,8 @@
             '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',
@@ -107,6 +109,38 @@
               '<(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',

ppapi/ppapi_untrusted.gyp

@@ -49,6 +49,8 @@
           '-lppapi_cpp',
           '-lppapi',
         ],
+        # 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/libppapi_cpp.a',
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a',
@@ -57,6 +59,22 @@
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_cpp.a',
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi.a',
         ],
+        'extra_deps_newlib64': [
+          '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a',
+          '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a',
+        ],
+        'extra_deps_newlib32': [
+          '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_cpp.a',
+          '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi.a',
+        ],
+        'extra_deps_glibc64': [
+          '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_cpp.a',
+          '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi.a',
+        ],
+        'extra_deps_glibc32': [
+          '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_cpp.a',
+          '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi.a',
+        ],
         'extra_deps_arm': [
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi_cpp.a',
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppapi.a',