summaryrefslogtreecommitdiffstats
path: root/chrome/nacl/nacl_helper_linux.cc
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-02 23:27:51 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-02 23:27:51 +0000
commit9d8380f4815fd036b0efe063ed506e4b417f8a0f (patch)
tree727b18b500a741737fb0663dc360bfa7b26b1a27 /chrome/nacl/nacl_helper_linux.cc
parent36bc6b9452bae07364f98248abdb51761fa074b3 (diff)
downloadchromium_src-9d8380f4815fd036b0efe063ed506e4b417f8a0f.zip
chromium_src-9d8380f4815fd036b0efe063ed506e4b417f8a0f.tar.gz
chromium_src-9d8380f4815fd036b0efe063ed506e4b417f8a0f.tar.bz2
Revert 140211 - NaCl: Update revision in DEPS, r8733 -> r8774
This change, specifically: r8768: (jvoung) Enable '-g' for pnacl and ARM broke the Chromium OS ARM build because we need to pull in a new version of the NaCl ARM toolchain that can build the IRT with '-g'. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10501013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl/nacl_helper_linux.cc')
-rw-r--r--chrome/nacl/nacl_helper_linux.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/nacl/nacl_helper_linux.cc b/chrome/nacl/nacl_helper_linux.cc
index b4e0494..3c63f75 100644
--- a/chrome/nacl/nacl_helper_linux.cc
+++ b/chrome/nacl/nacl_helper_linux.cc
@@ -25,7 +25,7 @@
#include "content/common/unix_domain_socket_posix.h"
#include "crypto/nss_util.h"
#include "ipc/ipc_switches.h"
-#include "native_client/src/trusted/service_runtime/sel_addrspace.h"
+#include "native_client/src/trusted/service_runtime/sel_memory.h"
namespace {