summaryrefslogtreecommitdiffstats
path: root/ppapi/ppapi_nacl_test_common.gypi
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi/ppapi_nacl_test_common.gypi')
-rw-r--r--ppapi/ppapi_nacl_test_common.gypi9
1 files changed, 2 insertions, 7 deletions
diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi
index c5e8a6f..ea61327 100644
--- a/ppapi/ppapi_nacl_test_common.gypi
+++ b/ppapi/ppapi_nacl_test_common.gypi
@@ -110,10 +110,6 @@
'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
'create_nmf_args_portable%': [],
'create_nonsfi_test_nmf': '<(DEPTH)/ppapi/tests/create_nonsfi_test_nmf.py',
- 'create_nmf_args': [
- '--no-default-libpath',
- '--objdump=>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump',
- ],
},
'target_conditions': [
['generate_nmf==1 and build_newlib==1', {
@@ -125,7 +121,6 @@
'action': [
'python',
'>(create_nmf)',
- '>@(create_nmf_args)',
'--output=>(nmf_newlib)',
'>@(create_nmf_args_portable)',
],
@@ -156,6 +151,7 @@
# doesn't work on Windows.
'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib',
'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32',
+ 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump',
},
'actions': [
{
@@ -168,7 +164,7 @@
'action': [
'python',
'>@(_inputs)',
- '>@(create_nmf_args)',
+ '--objdump=>(nacl_objdump)',
'--output=>(nmf_glibc)',
'--path-prefix=>(nexe_target)_libs',
'--stage-dependencies=<(nacl_glibc_out_dir)',
@@ -205,7 +201,6 @@
'action': [
'python',
'>(create_nmf)',
- '>@(create_nmf_args)',
'--output=>(nmf_pnacl_newlib)',
'>(out_pnacl_newlib)',
'>@(create_nmf_args_portable)',