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

Unified Diff: chrome/test/data/nacl/nacl_browser_test.gypi

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
« no previous file with comments | « no previous file | native_client_sdk/src/build_tools/build_sdk.py » ('j') | ppapi/ppapi_untrusted.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/nacl/nacl_browser_test.gypi
diff --git a/chrome/test/data/nacl/nacl_browser_test.gypi b/chrome/test/data/nacl/nacl_browser_test.gypi
index 9b6ab4b9f06848dd094e1d82b76e933d9dec6f4b..ac39a1c3131a4de2f14130134b03b460467d5758 100644
--- a/chrome/test/data/nacl/nacl_browser_test.gypi
+++ b/chrome/test/data/nacl/nacl_browser_test.gypi
@@ -27,6 +27,7 @@
'nmf_glibc': '>(nacl_glibc_out_dir)/>(nexe_target).nmf',
},
'dependencies': [
+ '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
'<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
],
@@ -129,11 +130,17 @@
'target_conditions': [
['enable_x86_64==1', {
'inputs': ['>(out_glibc64)'],
- 'action': ['--library-path=>(libdir_glibc64)'],
+ 'action': [
+ '--library-path=>(libdir_glibc64)',
+ '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64',
noelallen1 2012/09/21 23:20:25 Are you using anything that's not in the SDK here?
binji 2012/09/24 17:59:56 Presently, all untrusted .a and .so files are buil
+ ],
}],
['enable_x86_32==1', {
'inputs': ['>(out_glibc32)'],
- 'action': ['--library-path=>(libdir_glibc32)'],
+ 'action': [
+ '--library-path=>(libdir_glibc32)',
+ '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
+ ],
}],
# TODO(ncbray) handle arm case. We don't have ARM glibc yet.
],
@@ -144,4 +151,4 @@
}],
],
},
-}
+}
« no previous file with comments | « no previous file | native_client_sdk/src/build_tools/build_sdk.py » ('j') | ppapi/ppapi_untrusted.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698