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

Unified Diff: ppapi/ppapi_nacl_test_common.gypi

Issue 133033002: Port manifest query tests from nacl_integration to browser_tests. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 6 years, 11 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_nacl_test_common.gypi
diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi
index 99599ef141ae5ddb43f48221ac75304721cb0ebc..34e61b376b56a9757b83fe0e6305b17f7ff74a00 100644
--- a/ppapi/ppapi_nacl_test_common.gypi
+++ b/ppapi/ppapi_nacl_test_common.gypi
@@ -90,6 +90,7 @@
'--strip-all',
],
'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
+ 'create_nmf_args_portable%': [],
},
'target_conditions': [
['generate_nmf==1 and build_newlib==1', {
@@ -100,18 +101,22 @@
'outputs': ['>(nmf_newlib)'],
'action': [
'python',
- '>@(_inputs)',
+ '>(create_nmf)',
'--output=>(nmf_newlib)',
+ '>@(create_nmf_args_portable)',
],
'target_conditions': [
['enable_x86_64==1', {
'inputs': ['>(out_newlib64)'],
+ 'action': ['>(out_newlib64)'],
}],
['enable_x86_32==1', {
'inputs': ['>(out_newlib32)'],
+ 'action': ['>(out_newlib32)'],
}],
['enable_arm==1', {
'inputs': ['>(out_newlib_arm)'],
+ 'action': ['>(out_newlib_arm)'],
}],
],
},
@@ -135,16 +140,18 @@
'outputs': ['>(nmf_glibc)'],
'action': [
'python',
- '>@(_inputs)',
+ '>(create_nmf)',
'--objdump=>(nacl_objdump)',
'--output=>(nmf_glibc)',
'--path-prefix=>(nexe_target)_libs',
'--stage-dependencies=<(nacl_glibc_out_dir)',
+ '>@(create_nmf_args_portable)',
],
'target_conditions': [
['enable_x86_64==1', {
'inputs': ['>(out_glibc64)'],
'action': [
+ '>(out_glibc64)',
'--library-path=>(libdir_glibc64)',
'--library-path=>(tc_lib_dir_glibc64)',
],
@@ -152,6 +159,7 @@
['enable_x86_32==1', {
'inputs': ['>(out_glibc32)'],
'action': [
+ '>(out_glibc32)',
'--library-path=>(libdir_glibc32)',
'--library-path=>(tc_lib_dir_glibc32)',
],
@@ -171,8 +179,10 @@
'outputs': ['>(nmf_pnacl_newlib)'],
'action': [
'python',
- '>@(_inputs)',
+ '>(create_nmf)',
'--output=>(nmf_pnacl_newlib)',
+ '>(out_pnacl_newlib)',
+ '>@(create_nmf_args_portable)',
],
},
],

Powered by Google App Engine
This is Rietveld 408576698