summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 18:57:53 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 18:57:53 +0000
commitc24c9e0439b57dc1f6b785255bbac78aaa31fd2d (patch)
tree11a9585c2d92b96f8f6067f34d3407655b12c37b /tools
parent2d4dbdb0bd2445350fe2f62cb1ebcc7f608bfe66 (diff)
downloadchromium_src-c24c9e0439b57dc1f6b785255bbac78aaa31fd2d.zip
chromium_src-c24c9e0439b57dc1f6b785255bbac78aaa31fd2d.tar.gz
chromium_src-c24c9e0439b57dc1f6b785255bbac78aaa31fd2d.tar.bz2
Roll Clang for the Android port 163674:167488.
This brings us up to the same version as the rest of Chromium. Disable -Wasm-operand-widths until crbug.com/159452 is fixed. BUG=159712, 156947, 159452 Review URL: https://chromiumcodereview.appspot.com/11371004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/clang/scripts/update.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index 570258b..d2d8ba7 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -8,13 +8,7 @@
# Do NOT CHANGE this if you don't know what you're doing -- see
# https://code.google.com/p/chromium/wiki/UpdatingClang
# Reverting problematic clang rolls is safe, though.
-if [[ $ANDROID_SDK_VERSION || $PWD =~ [Aa]ndroid ]]; then
- # Temporarily revert the last clang roll on android due to
- # http://crbug.com/156947
- CLANG_REVISION=163674
-else
- CLANG_REVISION=167488
-fi
+CLANG_REVISION=167488
THIS_DIR="$(dirname "${0}")"
LLVM_DIR="${THIS_DIR}/../../../third_party/llvm"