summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation/automation_provider_json.h
diff options
context:
space:
mode:
authormcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-16 23:05:30 +0000
committermcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-16 23:05:30 +0000
commit938f4ea71a0e2806f4c50b4c6d59c1586f8aa399 (patch)
tree3e998b06641a74dd7652b422d8ee0b812c755be8 /chrome/browser/automation/automation_provider_json.h
parentcf469aeabb7aceef1903e70e2380ebbcba90c2b9 (diff)
downloadchromium_src-938f4ea71a0e2806f4c50b4c6d59c1586f8aa399.zip
chromium_src-938f4ea71a0e2806f4c50b4c6d59c1586f8aa399.tar.gz
chromium_src-938f4ea71a0e2806f4c50b4c6d59c1586f8aa399.tar.bz2
Add NACL_{BUILD,TARGET}_ARCH to nacl_defines; cover ARM case too
chrome/renderer/nacl_desc_wrapper_chrome.cc (indirectly via native_client/src/include/nacl_base.h) depends on NACL_BUILD_ARCH being defined. Before http://codereview.chromium.org/8973002 (native_client r7458) the code failed to notice the missing definition and defaulted to x86 by happenstance. Now the (Linux) compile fails unless all the right macros are defined. Define them for the chrome compilation so we won't have this problem next time nacl_revision gets updated. It also makes the affected native_client code actually use the right code in a non-x86 (i.e. ARM) build. BUG= none TEST= fixes Linux build of chrome with native_client tip of tree R=mseaborn@chromium.org Review URL: http://codereview.chromium.org/8964022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_provider_json.h')
0 files changed, 0 insertions, 0 deletions