| 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 af1dec1429439700bc20de3fc3f9203630b3df48..ab6414e0eabf061c1df583743d706735be5193a3 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
|
| @@ -16,19 +16,17 @@
|
| 'action_name': 'Untar pnacl_translator',
|
| 'description': 'Untar pnacl_translator',
|
| 'inputs': [
|
| - '<(DEPTH)/native_client/build/cygtar.py',
|
| - '<(DEPTH)/native_client/toolchain/.tars/naclsdk_pnacl_translator.tgz',
|
| + '<(DEPTH)/native_client/build/package_version/package_version.py',
|
| + '<(DEPTH)/native_client/toolchain/.tars/<(OS)_x86/pnacl_translator.json',
|
| ],
|
| - 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/pnacl_translator/stamp.untar'],
|
| + 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/<(OS)_x86/pnacl_translator/pnacl_translator.json'],
|
| 'action': [
|
| 'python',
|
| - '<(DEPTH)/native_client/build/untar_toolchain.py',
|
| - '--tool', 'pnacl',
|
| - '--tmp', '<(SHARED_INTERMEDIATE_DIR)/temp/untar',
|
| - '--sdk', '<(SHARED_INTERMEDIATE_DIR)/temp/sdk',
|
| - '--os', '<(OS)',
|
| - '--fin', '<(SHARED_INTERMEDIATE_DIR)/pnacl_translator',
|
| - '<(DEPTH)/native_client/toolchain/.tars/naclsdk_pnacl_translator.tgz',
|
| + '<(DEPTH)/native_client/build/package_version/package_version.py',
|
| + '--packages', 'pnacl_translator',
|
| + '--tar-dir', '<(DEPTH)/native_client/toolchain/.tars',
|
| + '--dest-dir', '<(SHARED_INTERMEDIATE_DIR)',
|
| + 'extract',
|
| ],
|
| }],
|
| },
|
| @@ -53,7 +51,7 @@
|
| 'inputs': [
|
| 'pnacl_component_crx_gen.py',
|
| # A stamp file representing the contents of pnacl_translator.
|
| - '<(SHARED_INTERMEDIATE_DIR)/pnacl_translator/stamp.untar',
|
| + '<(SHARED_INTERMEDIATE_DIR)/<(OS)_x86/pnacl_translator/pnacl_translator.json',
|
| '<(DEPTH)/native_client/pnacl/driver/pnacl_info_template.json',
|
| '<(DEPTH)/native_client/TOOL_REVISIONS',
|
| ],
|
| @@ -185,7 +183,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)/pnacl_translator',
|
| + '--pnacl_translator_path=<(SHARED_INTERMEDIATE_DIR)/<(OS)_x86/pnacl_translator',
|
| '--tool_revisions_path=<(DEPTH)/native_client/TOOL_REVISIONS',
|
| # ABI Version Number.
|
| '1',
|
|
|