Bug 1508547 - Switch Android builds to clang 7 again. r=dmajor
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 20 Nov 2018 22:10:49 +0000
changeset 503830 8540104bb0bd811f9fd45b160dbe38a67c9aa5cd
parent 503829 6f3303d415f7920900d800869ce901eed060c889
child 503851 50785e9ffd05cad4eaa1ced6485534fb1f099892
child 503853 b4754021fc2dbeb9a96fc85cacc52ec1c63d1453
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor
bugs1508547, 1492663, 1503330
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1508547 - Switch Android builds to clang 7 again. r=dmajor Bug 1492663 upgraded those builds to clang 7, and bug 1503330 brought them back to clang 6 because of speedometer regressions. With the previous change, the regression doesn't happen any more, allowing to upgrade again. Depends on D12394 Differential Revision: https://phabricator.services.mozilla.com/D12395
build/build-clang/clang-6-linux64.json
taskcluster/ci/build/android.yml
taskcluster/ci/toolchain/linux.yml
taskcluster/scripts/misc/build-clang-6-linux.sh
deleted file mode 100644
--- a/build/build-clang/clang-6-linux64.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "llvm_revision": "335538",
-    "stages": "3",
-    "build_libcxx": true,
-    "build_type": "Release",
-    "assertions": false,
-    "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_601/final",
-    "clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_601/final",
-    "lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_601/final",
-    "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_601/final",
-    "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_601/final",
-    "libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_601/final",
-    "python_path": "/usr/bin/python2.7",
-    "gcc_dir": "/builds/worker/workspace/build/src/gcc",
-    "cc": "/builds/worker/workspace/build/src/gcc/bin/gcc",
-    "cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
-    "as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
-    "patches": [
-      "static-llvm-symbolizer.patch",
-      "find_symbolizer_linux.patch",
-      "r322325.patch",
-      "r322401.patch",
-      "r325356.patch",
-      "r339636.patch"
-    ]
-}
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -335,17 +335,17 @@ android-api-16/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: api-16
         tooltool-downloads: internal
     toolchains:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
-        - linux64-clang-6
+        - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
         - linux64-node
 
 android-api-16-without-google-play-services/opt:
     description: "Android 4.0 api-16+ (without Google Play Services) Opt"
@@ -389,17 +389,17 @@ android-api-16-without-google-play-servi
         secrets: true
         custom-build-variant-cfg: api-16-without-google-play-services
         tooltool-downloads: internal
     run-on-projects: ['mozilla-central']
     toolchains:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
-        - linux64-clang-6
+        - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
         - linux64-node
 
 android-api-16-nightly/opt:
     description: "Android 4.0 api-16+ Nightly"
@@ -451,17 +451,17 @@ android-api-16-nightly/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: api-16
         tooltool-downloads: internal
     toolchains:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
-        - linux64-clang-6
+        - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
         - linux64-node
 
 android-aarch64/opt:
     description: "Android 5.0 AArch64 Opt"
@@ -508,17 +508,17 @@ android-aarch64/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: aarch64
         tooltool-downloads: internal
     toolchains:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
-        - linux64-clang-6
+        - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-cbindgen
         - linux64-sccache
         - linux64-node
 
 android-aarch64-nightly/opt:
     description: "Android 5.0 AArch64 Nightly"
@@ -570,17 +570,17 @@ android-aarch64-nightly/opt:
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: aarch64
         tooltool-downloads: internal
     toolchains:
         - android-gradle-dependencies
         - android-ndk-linux
         - android-sdk-linux
-        - linux64-clang-6
+        - linux64-clang
         - linux64-rust-android
         - linux64-rust-size
         - linux64-sccache
         - linux64-cbindgen
         - linux64-node
 
 android-x86_64/opt:
     description: "Android 5.0 x86-64 Opt"
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -22,37 +22,16 @@ linux64-clang-3.9:
         resources:
             - 'build/build-clang/build-clang.py'
             - 'build/build-clang/clang-3.9-linux64.json'
             - 'taskcluster/scripts/misc/tooltool-download.sh'
         toolchain-artifact: public/build/clang.tar.xz
     toolchains:
         - linux64-gcc-4.9
 
-linux64-clang-6:
-    description: "Clang 6 toolchain build"
-    treeherder:
-        kind: build
-        platform: toolchains/opt
-        symbol: TL(clang6)
-        tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-xlarge
-    worker:
-        max-run-time: 7200
-    run:
-        using: toolchain-script
-        script: build-clang-6-linux.sh
-        resources:
-            - 'build/build-clang/build-clang.py'
-            - 'build/build-clang/clang-6-linux64.json'
-            - 'taskcluster/scripts/misc/tooltool-download.sh'
-        toolchain-artifact: public/build/clang.tar.xz
-    toolchains:
-        - linux64-gcc-4.9
-
 linux64-clang-7:
     description: "Clang 7 toolchain build"
     treeherder:
         kind: build
         platform: toolchains/opt
         symbol: TL(clang7)
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux-xlarge
deleted file mode 100755
--- a/taskcluster/scripts/misc/build-clang-6-linux.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -x -e -v
-
-# This script is for building clang for Linux.
-
-WORKSPACE=$HOME/workspace
-HOME_DIR=$WORKSPACE/build
-UPLOAD_DIR=$HOME/artifacts
-
-cd $HOME_DIR/src
-
-. taskcluster/scripts/misc/tooltool-download.sh
-
-# gets a bit too verbose here
-set +x
-
-cd build/build-clang
-# |mach python| sets up a virtualenv for us!
-../../mach python ./build-clang.py -c clang-6-linux64.json
-
-set -x
-
-# Put a tarball in the artifacts dir
-mkdir -p $UPLOAD_DIR
-cp clang.tar.* $UPLOAD_DIR