diff options
author | jasonwkim@google.com <jasonwkim@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 18:16:11 +0000 |
---|---|---|
committer | jasonwkim@google.com <jasonwkim@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 18:16:11 +0000 |
commit | f0c4fce5e4fb464d29b8803554aeaed69862d33f (patch) | |
tree | cb00f1197f6ca79ab492c09c7bf55b9cedd784c6 /chrome/browser/net | |
parent | 45a6201b579255882cb0e5bd569495d4fc6af502 (diff) | |
download | chromium_src-f0c4fce5e4fb464d29b8803554aeaed69862d33f.zip chromium_src-f0c4fce5e4fb464d29b8803554aeaed69862d33f.tar.gz chromium_src-f0c4fce5e4fb464d29b8803554aeaed69862d33f.tar.bz2 |
Move the definition of disable_nacl% inside a conditional
and remove the explicit commingling of target_arch=arm and disable_nacl
in other parts.
The net effect is that NaCl is still disabled on ARM but is more easily
enabled.
R=bradnelson@google.com
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/8352025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
0 files changed, 0 insertions, 0 deletions