diff options
author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2022-11-11 23:35:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-11 23:35:38 +0000 |
commit | 40214b48188358a80b7478bfff21d4814dd9177c (patch) | |
tree | 77dc031614745bb406dbd90cea9a082a1b5cdd54 /compiler_wrapper/install_compiler_wrapper.sh | |
parent | a51582ad9cb50ec284f4718765bd5d31fa0069d4 (diff) | |
parent | 584b8e46d146a2bcfeffd64448a2d8e92904168d (diff) | |
download | toolchain-utils-android14-dev.tar.gz |
Upgrade toolchain-utils to 2c474af4f370b143032144aff1ff1985f789e20f am: 8b320f7173 am: d444309511 am: 584b8e46d1android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/2292563
Change-Id: Ida212764c332af8ba8ab8aaa62a7d2a007e3314e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'compiler_wrapper/install_compiler_wrapper.sh')
-rwxr-xr-x | compiler_wrapper/install_compiler_wrapper.sh | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/compiler_wrapper/install_compiler_wrapper.sh b/compiler_wrapper/install_compiler_wrapper.sh index 3a5b7417..81459082 100755 --- a/compiler_wrapper/install_compiler_wrapper.sh +++ b/compiler_wrapper/install_compiler_wrapper.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2020 The Chromium OS Authors. All rights reserved. +# Copyright 2020 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -11,18 +11,41 @@ if [[ ! -e /etc/cros_chroot_version ]]; then exit 1 fi set -e + +# Use a unique value here, since folks doing wrapper dev _likely_ want builds +# to always be redone. +version_suffix="manually_installed_wrapper_at_unix_$(date +%s.%6N)" +echo "Using toolchain hash: ${version_suffix}" cd "$(dirname "$(readlink -m "$0")")" + +build_py() { + ./build.py --version_suffix="${version_suffix}" "$@" +} + echo "Updated files:" # Update the host wrapper -./build.py --config=cros.host --use_ccache=false --use_llvm_next=false --output_file=./clang_host_wrapper +build_py \ + --config=cros.host \ + --use_ccache=false \ + --use_llvm_next=false \ + --output_file=./clang_host_wrapper sudo mv ./clang_host_wrapper /usr/bin/clang_host_wrapper echo "/usr/bin/clang_host_wrapper" sudo cp ../binary_search_tool/bisect_driver.py /usr/bin echo "/usr/bin/clang_host_wrapper/bisect_driver.py" # Update the target wrappers -./build.py --config=cros.hardened --use_ccache=false --use_llvm_next=false --output_file=./sysroot_wrapper.hardened.noccache -./build.py --config=cros.hardened --use_ccache=true --use_llvm_next=false --output_file=./sysroot_wrapper.hardened.ccache +build_py \ + --config=cros.hardened \ + --use_ccache=false \ + --use_llvm_next=false \ + --output_file=./sysroot_wrapper.hardened.noccache +build_py \ + --config=cros.hardened \ + --use_ccache=true \ + --use_llvm_next=false \ + --output_file=./sysroot_wrapper.hardened.ccache + # Update clang target wrappers. sudo cp ./sysroot_wrapper.hardened.noccache ./sysroot_wrapper.hardened.ccache /usr/bin echo "Updated clang wrapper /usr/bin/sysroot_wrapper.hardened.noccache" @@ -30,7 +53,7 @@ echo "Updated clang wrapper /usr/bin/sysroot_wrapper.hardened.ccache" # Update GCC target wrappers. for GCC in cross-x86_64-cros-linux-gnu/gcc cross-armv7a-cros-linux-gnueabihf/gcc cross-aarch64-cros-linux-gnu/gcc; do - if ! FILES="$(equery f ${GCC})"; then + if ! FILES="$(equery f "${GCC}")"; then if [[ $(equery l "${GCC}" 2>&1 | wc -c) -eq 0 ]]; then echo "no ${GCC} package found; skipping" >&2 continue |