Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Unified Diff: ppapi/ppapi_untrusted.gyp

Issue 10409032: Enable PPAPINaCl GLIBC browser_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/ppapi_untrusted.gyp
diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp
index ebe4e5f6fd68acd8dcfc7feafea92f4cdfbd1562..d226d444402774901b185f129407624c81a5822a 100644
--- a/ppapi/ppapi_untrusted.gyp
+++ b/ppapi/ppapi_untrusted.gyp
@@ -17,7 +17,7 @@
'type': 'none',
'variables': {
'nlib_target': 'libppapi_cpp.a',
- 'build_glibc': 0,
+ 'build_glibc': 1,
'build_newlib': 1,
'sources': [
'<@(cpp_source_files)',
@@ -39,7 +39,7 @@
],
'variables': {
'nexe_target': 'ppapi_nacl_tests',
- 'build_glibc': 0,
+ 'build_glibc': 1,
'build_newlib': 1,
'include_dirs': [
'lib/gl/include',
@@ -49,14 +49,22 @@
'-lppapi_cpp',
'-lppapi',
],
- 'extra_deps64': [
+ 'extra_deps_newlib64': [
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a',
],
- 'extra_deps32': [
+ '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',

Powered by Google App Engine
This is Rietveld 408576698