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

Unified Diff: ppapi/native_client/src/untrusted/pnacl_support_extension/nacl.scons

Issue 11016031: PNaCl: Use the PPAPI shims library on all architectures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update comment Created 8 years, 2 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 | « no previous file | 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/nacl.scons
diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/nacl.scons b/ppapi/native_client/src/untrusted/pnacl_support_extension/nacl.scons
index ba5a5b24b05346a58d4e0f9916b3ea768e9a10bb..5bf1e7fb6764331665a5f403808fea267a9745b3 100644
--- a/ppapi/native_client/src/untrusted/pnacl_support_extension/nacl.scons
+++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/nacl.scons
@@ -12,17 +12,13 @@ if not env.Bit('bitcode'):
Return()
# Override the IRT shim with the latest one built in scons-out.
-# Otherwise, there may be a mismatch between the latest pepper headers
-# and the IRT shim that we built in the toolchain tarball.
+# It is the version that matches the current version of PPAPI.
#
# We pick exactly that file for now, because the other files in
# ${LIB_DIR} are bitcode and we don't want to pollute the CRX with those.
arch = env['TARGET_FULLARCH']
-lib_override = ''
-lib_dep = []
-if arch == 'x86-64':
- lib_override = ('--lib_override=%s,${LIB_DIR}/libpnacl_irt_shim.a ' % arch)
- lib_dep = [env.File('${LIB_DIR}/libpnacl_irt_shim.a')]
+lib_override = ('--lib_override=%s,${LIB_DIR}/libpnacl_irt_shim.a ' % arch)
+lib_dep = [env.File('${LIB_DIR}/libpnacl_irt_shim.a')]
output_dir = env.GetPnaclExtensionRootNode().abspath
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698