diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 19:54:38 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 19:54:38 +0000 |
| commit | ebd08aa747212d67bdab00a6bf4dcd7bc4a3287f (patch) | |
| tree | 4d072ea4ee1c34e205c8e6d587fd760618b09c7b /ppapi/ppapi_untrusted.gyp | |
| parent | 3f87e41a2d090986ee17cd3c5f7bef0b1b9ecefd (diff) | |
| download | chromium_src-ebd08aa747212d67bdab00a6bf4dcd7bc4a3287f.zip chromium_src-ebd08aa747212d67bdab00a6bf4dcd7bc4a3287f.tar.gz chromium_src-ebd08aa747212d67bdab00a6bf4dcd7bc4a3287f.tar.bz2 | |
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
Diffstat (limited to 'ppapi/ppapi_untrusted.gyp')
| -rw-r--r-- | ppapi/ppapi_untrusted.gyp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp index ebe4e5f..57fe4a1 100644 --- a/ppapi/ppapi_untrusted.gyp +++ b/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', |