diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 23:16:11 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 23:16:11 +0000 |
| commit | 22062748ecf720f8f806fa7f7216e903a2f9579d (patch) | |
| tree | 8fa9c8f11e12cbaaf919846229a9a577c1a8d757 /tools/clang | |
| parent | 4d0f818ba2e842cf1732e40b231387c1a2699b0f (diff) | |
| download | chromium_src-22062748ecf720f8f806fa7f7216e903a2f9579d.zip chromium_src-22062748ecf720f8f806fa7f7216e903a2f9579d.tar.gz chromium_src-22062748ecf720f8f806fa7f7216e903a2f9579d.tar.bz2 | |
Temporarily revert clang back to 163674 on android
Patch co-authored with ilevy.
Logic:
$ANDROID_SDK_VERSION will fix dev and clank internal bots, which don't have android in path. It will also fix fyi bot, for now.
PWD matching 'android' will fix trybots
PWD matching 'Android' will keep FYI bot working if updateclang starts getting calling in update stage (if we start using gclient_env, like trybots do)
BUG=156947
Review URL: https://codereview.chromium.org/11232020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang')
| -rwxr-xr-x | tools/clang/scripts/update.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index 3e568b9..0fcfa6f 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -8,7 +8,13 @@ # 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. -CLANG_REVISION=165787 +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=165787 +fi THIS_DIR="$(dirname "${0}")" LLVM_DIR="${THIS_DIR}/../../../third_party/llvm" |