Commit d341b4e7 authored by horo@chromium.org's avatar horo@chromium.org

Revert of Turn on clang by default on linux, 3rd try. (https://codereview.chromium.org/379413002/)

Reason for revert:
NaClBrowserTestNonSfiMode.Messaging and NaClBrowserTestNonSfiMode.Irt failed.

http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests/builds/12124/steps/browser_tests/logs/Irt
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests/builds/12124/steps/browser_tests/logs/Messaging

Original issue's description:
> Turn on clang by default on linux, 3rd try.
> 
> This is mostly to collect performance and size data for now, and to find out
> if more bots need work. Unless things look really good, I'm going to revert
> this by thursday morning (PDT).
> 
> BUG=360311
> TBR=ajwong@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=282246

TBR=awong@chromium.org,thakis@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=360311

Review URL: https://codereview.chromium.org/378363006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282265 0039d316-1c4b-4281-b951-d872f2087c98
parent bec7f1c6
...@@ -1777,10 +1777,6 @@ ...@@ -1777,10 +1777,6 @@
# the class names, so the JNI generator needs to know this. # the class names, so the JNI generator needs to know this.
'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt', 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt',
}], }],
['OS=="linux"', {
# TODO(thakis): This is here to measure perf for a while.
'clang%': 1,
}], # OS=="mac"
['OS=="mac"', { ['OS=="mac"', {
'conditions': [ 'conditions': [
# All Chrome builds have breakpad symbols, but only process the # All Chrome builds have breakpad symbols, but only process the
......
...@@ -137,6 +137,13 @@ while [[ $# > 0 ]]; do ...@@ -137,6 +137,13 @@ while [[ $# > 0 ]]; do
shift shift
done done
# Remove clang on bots where it was autoinstalled in r281914.
if [[ -f "${LLVM_BUILD_DIR}/autoinstall_stamp" ]]; then
echo Removing autoinstalled clang and clobbering
rm -rf "${LLVM_BUILD_DIR}"
rm -rf "${THIS_DIR}/../../../out"
fi
if [[ -n "$if_needed" ]]; then if [[ -n "$if_needed" ]]; then
if [[ "${OS}" == "Darwin" ]]; then if [[ "${OS}" == "Darwin" ]]; then
# clang is used on Mac. # clang is used on Mac.
...@@ -148,12 +155,6 @@ if [[ -n "$if_needed" ]]; then ...@@ -148,12 +155,6 @@ if [[ -n "$if_needed" ]]; then
# clang previously downloaded, remove third_party/llvm-build to prevent # clang previously downloaded, remove third_party/llvm-build to prevent
# updating. # updating.
true true
elif [[ "${OS}" == "Linux" ]]; then
# Temporarily use clang on linux. Leave a stamp file behind, so that
# this script can remove clang again on machines where it was autoinstalled.
mkdir -p "${LLVM_BUILD_DIR}"
touch "${LLVM_BUILD_DIR}/autoinstall_stamp"
true
else else
# clang wasn't needed, not doing anything. # clang wasn't needed, not doing anything.
exit 0 exit 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment