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

Unified Diff: ppapi/ppapi_nacl.gyp

Issue 1066823003: [NaCl SDK] Remove create_nmf dependency on NACL_SDK_ROOT env var (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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.gyp
diff --git a/ppapi/ppapi_nacl.gyp b/ppapi/ppapi_nacl.gyp
index 9fdabc3c60613819f78a10ae2ab5be538b706ea3..91a4a40a72e07239cf09fb918e27398c473621a6 100644
--- a/ppapi/ppapi_nacl.gyp
+++ b/ppapi/ppapi_nacl.gyp
@@ -139,6 +139,10 @@
'--strip-all',
],
'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
+ 'create_nmf_flags': [
+ '--no-default-libpath',
+ '--objdump=>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump',
+ ],
'create_nonsfi_test_nmf': 'tests/create_nonsfi_test_nmf.py',
},
'conditions': [
@@ -149,7 +153,6 @@
# 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',
'nmf_glibc%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf',
},
'actions': [
@@ -165,7 +168,7 @@
'action': [
'python',
'>@(_inputs)',
- '--objdump=>(nacl_objdump)',
+ '>@(create_nmf_flags)',
'--output=>(nmf_glibc)',
'--stage-dependencies=<(PRODUCT_DIR)',
],
@@ -218,6 +221,7 @@
'action': [
'python',
'>@(_inputs)',
+ '>@(create_nmf_flags)',
'--output=>(nmf_pnacl)',
],
'conditions': [
@@ -324,6 +328,7 @@
'action': [
'python',
'>@(_inputs)',
+ '>@(create_nmf_flags)',
'--output=>(nmf_pnacl)',
],
},
@@ -347,6 +352,7 @@
'action': [
'python',
'>@(_inputs)',
+ '>@(create_nmf_flags)',
'--output=>(nmf_pnacl)',
],
},

Powered by Google App Engine
This is Rietveld 408576698