summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjasonwkim@google.com <jasonwkim@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 02:05:39 +0000
committerjasonwkim@google.com <jasonwkim@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 02:05:39 +0000
commitfbf59d6e27560cd63952c79ae18216fda42d690f (patch)
treec1d827dee9d383ec3a1337809db04a3dbfaa4a4b
parentd8239799ad648df9a4a4e0e5d7fc040c1f84365c (diff)
downloadchromium_src-fbf59d6e27560cd63952c79ae18216fda42d690f.zip
chromium_src-fbf59d6e27560cd63952c79ae18216fda42d690f.tar.gz
chromium_src-fbf59d6e27560cd63952c79ae18216fda42d690f.tar.bz2
IRT name was incorrect
Activate IRT building on ARM for NaCl. In order for this to be on for real, the PNaCl toolchain still needs to available Since NaCl is still turned off by default on ARM, this code should be a no-op for all other cases. This also moves the compilation a step forward for ARM. There is a bootstrap dependency on memset on ARM - so SYSROOT on the ChromiumOS chroot is required to gain access to libc. R=bradnelson,robertm BUG=http://code.google.com/p/chromium/issues/detail?id=61695 BUG=http://code.google.com/p/chromium/issues/detail?id=38909 BUG=http://code.google.com/p/nativeclient/issues/detail?id=135 Review URL: http://codereview.chromium.org/8375035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107040 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/nacl.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index 1836a27..6d29b16 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -143,7 +143,7 @@
'inputs': [
'<!@(<(irt_inputs_cmd) --platform=arm)',
],
- 'outputs': ['<(PRODUCT_DIR)/nacl_ir.nexe'],
+ 'outputs': ['<(PRODUCT_DIR)/nacl_irt_arm.nexe'],
'action': [
'<@(irt_build_cmd)', '--platform', 'arm',
],