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

Unified Diff: ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py

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
Index: ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
index bdc6cbf890bb6c5ecec637afed67ce369338dc34..f3726c7f4741dc17dbb690d205fc84ded2b62492 100755
--- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
+++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py
@@ -54,13 +54,6 @@ ARCHES = ['x86-32', 'x86-64', 'arm', 'mips32']
def IsValidArch(arch):
return arch in ARCHES
-# The version of the arch used by configure and pnacl's build.sh.
-def StandardArch(arch):
- return {'x86-32': 'i686',
- 'x86-64': 'x86_64',
- 'arm' : 'armv7',
- 'mips32': 'mips'}[arch]
-
######################################################################
@@ -170,11 +163,11 @@ class PnaclDirs(object):
@staticmethod
def LibDir(target_arch):
- return J(PnaclDirs.TranslatorRoot(), 'lib-%s' % target_arch)
+ return J(PnaclDirs.TranslatorRoot(), 'translator', '%s' % target_arch)
@staticmethod
def SandboxedCompilerDir(target_arch):
- return J(PnaclDirs.TranslatorRoot(), StandardArch(target_arch), 'bin')
+ return J(PnaclDirs.TranslatorRoot(), 'translator', target_arch, 'bin')
@staticmethod
def SetOutputDir(d):

Powered by Google App Engine
This is Rietveld 408576698