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

Unified Diff: ppapi/ppapi_untrusted.gyp

Issue 10915213: [NaCl SDK] build_sdk uses gyp to build, not scons. * (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac fixes Created 8 years, 3 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 9f78f1997d29d83c47d32fa55baab3bdb9a15852..9f14e122627eb04693f6908c5b7a4c442484986f 100644
--- a/ppapi/ppapi_untrusted.gyp
+++ b/ppapi/ppapi_untrusted.gyp
@@ -17,6 +17,7 @@
'type': 'none',
'variables': {
'nlib_target': 'libppapi_cpp.a',
+ 'nso_target': 'libppapi_cpp.so',
'build_glibc': 1,
'build_newlib': 1,
'sources': [
@@ -34,6 +35,7 @@
'type': 'none',
'variables': {
'nlib_target': 'libppapi_gles2.a',
+ 'nso_target': 'libppapi_gles2.so',
'build_glibc': 1,
'build_newlib': 1,
'include_dirs': [
@@ -53,6 +55,7 @@
'target_name': 'ppapi_nacl_tests',
'type': 'none',
'dependencies': [
+ '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
'ppapi_cpp_lib',
'native_client/native_client.gyp:ppapi_lib',
],
@@ -140,6 +143,8 @@
'--objdump=>(nacl_objdump)',
'--library-path=>(libdir_glibc64)',
'--library-path=>(libdir_glibc32)',
+ '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
+ '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64',
noelallen1 2012/09/21 23:20:25 Should we be changing the output directory for the
'--output=>(nmf_glibc)',
'--stage-dependencies=<(PRODUCT_DIR)',
'--toolchain=glibc',

Powered by Google App Engine
This is Rietveld 408576698