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

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

Issue 10958026: Port ppapi_ppb_core nacl_integration test to browser_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix dependancies. 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 | « chrome/test/data/nacl/DEPS ('k') | chrome/test/data/nacl/nacl_test_data.gyp » ('j') | no next file with comments »
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 ac39a1c3131a4de2f14130134b03b460467d5758..557acc2a4f176bf29ebb1e3e84ffc3727b61a294 100644
--- a/chrome/test/data/nacl/nacl_browser_test.gypi
+++ b/chrome/test/data/nacl/nacl_browser_test.gypi
@@ -16,15 +16,21 @@
'variables': {
'test_files': [],
'nacl_newlib_out_dir': '<(PRODUCT_DIR)/nacl_test_data/newlib',
- 'out_newlib32': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32.nexe',
- 'out_newlib64': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_64.nexe',
- 'out_newlib_arm': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_arm.nexe',
- 'nmf_newlib': '>(nacl_newlib_out_dir)/>(nexe_target).nmf',
'nacl_glibc_out_dir': '<(PRODUCT_DIR)/nacl_test_data/glibc',
- 'out_glibc32': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_32.nexe',
- 'out_glibc64': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_64.nexe',
- 'out_glibc_arm': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_arm.nexe',
- 'nmf_glibc': '>(nacl_glibc_out_dir)/>(nexe_target).nmf',
+ 'target_conditions': [
+ ['nexe_target!=""', {
+ # These variables are used for nexe building and for library building,
+ # so they should be unconditionally re-defined.
+ 'out_newlib32': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32.nexe',
+ 'out_newlib64': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_64.nexe',
+ 'out_newlib_arm': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_arm.nexe',
+ 'nmf_newlib': '>(nacl_newlib_out_dir)/>(nexe_target).nmf',
+ 'out_glibc32': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_32.nexe',
+ 'out_glibc64': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_x86_64.nexe',
+ 'out_glibc_arm': '>(nacl_glibc_out_dir)/>(nexe_target)_glibc_arm.nexe',
+ 'nmf_glibc': '>(nacl_glibc_out_dir)/>(nexe_target).nmf',
+ }],
+ ],
},
'dependencies': [
'<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
« no previous file with comments | « chrome/test/data/nacl/DEPS ('k') | chrome/test/data/nacl/nacl_test_data.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698