commit a36e5920737c6adbddd3e43b760e5de8431db6e0
author Torne (Richard Coles) <torne@google.com> Mon Aug 05 13:57:33 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Mon Aug 05 13:57:33 2013 +0100
tree 347d048bb8c8828d50113bf94ace40bf0613f2cd
parent 34378da0e9429d394aafdaa771301aff58447cb1

Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca

ppapi/ppapi_nacl_test_common.gypi

diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi
index 2d7173d..dd1adb1 100644
--- a/ppapi/ppapi_nacl_test_common.gypi
+++ b/ppapi/ppapi_nacl_test_common.gypi
@@ -152,14 +152,14 @@
                     'inputs': ['>(out_glibc64)'],
                     'action': [
                       '--library-path=>(libdir_glibc64)',
-                      '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64',
+                      '--library-path=>(tc_lib_dir_glibc64)',
                     ],
                   }],
                   ['enable_x86_32==1', {
                     'inputs': ['>(out_glibc32)'],
                     'action': [
                       '--library-path=>(libdir_glibc32)',
-                      '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
+                      '--library-path=>(tc_lib_dir_glibc32)',
                     ],
                   }],
                   # TODO(ncbray) handle arm case.  We don't have ARM glibc yet.