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

Unified Diff: ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp

Issue 597393003: NaCl: Update revision in DEPS, r13770 -> r13783 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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 | « ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
index 8a048a44e1c7b9dc2860b4f1da10bd2fea251c49..db0c603ff1d9715f83442f4e101a1fe549984154 100644
--- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
+++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
@@ -19,14 +19,14 @@
'<(DEPTH)/native_client/build/package_version/package_version.py',
'<(DEPTH)/native_client/toolchain/.tars/<(TOOLCHAIN_OS)_x86/pnacl_translator.json',
],
- 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/<(TOOLCHAIN_OS)_x86/pnacl_translator/pnacl_translator.json'],
+ 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_translator/pnacl_translator.json'],
'action': [
'python',
'<(DEPTH)/native_client/build/package_version/package_version.py',
'--quiet',
'--packages', 'pnacl_translator',
'--tar-dir', '<(DEPTH)/native_client/toolchain/.tars',
- '--dest-dir', '<(SHARED_INTERMEDIATE_DIR)',
+ '--dest-dir', '<(SHARED_INTERMEDIATE_DIR)/sdk',
'extract',
],
}],
@@ -52,7 +52,7 @@
'inputs': [
'pnacl_component_crx_gen.py',
# A stamp file representing the contents of pnacl_translator.
- '<(SHARED_INTERMEDIATE_DIR)/<(TOOLCHAIN_OS)_x86/pnacl_translator/pnacl_translator.json',
+ '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_translator/pnacl_translator.json',
'<(DEPTH)/native_client/pnacl/driver/pnacl_info_template.json',
'<(DEPTH)/native_client/toolchain_revisions/pnacl_newlib.json',
],
@@ -184,7 +184,7 @@
'<@(lib_overrides)',
'--target_arch=<(target_arch)',
'--info_template_path=<(DEPTH)/native_client/pnacl/driver/pnacl_info_template.json',
- '--pnacl_translator_path=<(SHARED_INTERMEDIATE_DIR)/<(TOOLCHAIN_OS)_x86/pnacl_translator',
+ '--pnacl_translator_path=<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_translator',
'--package_version_path=<(DEPTH)/native_client/build/package_version/package_version.py',
'--pnacl_package_name=pnacl_newlib',
# ABI Version Number.
« no previous file with comments | « ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698