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 /binary_search_tool/sysroot_wrapper | |
parent | a51582ad9cb50ec284f4718765bd5d31fa0069d4 (diff) | |
parent | 584b8e46d146a2bcfeffd64448a2d8e92904168d (diff) | |
download | toolchain-utils-android14-d2-s3-release.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 'binary_search_tool/sysroot_wrapper')
5 files changed, 26 insertions, 23 deletions
diff --git a/binary_search_tool/sysroot_wrapper/cleanup.sh b/binary_search_tool/sysroot_wrapper/cleanup.sh index 5066d638..b3ae2dd9 100755 --- a/binary_search_tool/sysroot_wrapper/cleanup.sh +++ b/binary_search_tool/sysroot_wrapper/cleanup.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2016 Google Inc. All Rights Reserved. +# Copyright 2016 Google LLC # # This script is part of the ChromeOS object binary search triage process. # It should be the last script called by the user, after the user has diff --git a/binary_search_tool/sysroot_wrapper/interactive_test_host.sh b/binary_search_tool/sysroot_wrapper/interactive_test_host.sh index 58adffc0..bd84936c 100755 --- a/binary_search_tool/sysroot_wrapper/interactive_test_host.sh +++ b/binary_search_tool/sysroot_wrapper/interactive_test_host.sh @@ -1,6 +1,6 @@ #!/bin/bash -u # -# Copyright 2017 Google Inc. All Rights Reserved. +# Copyright 2017 Google LLC # # This script is intended to be used by binary_search_state.py, as # part of the binary search triage on ChromeOS package and object files for a diff --git a/binary_search_tool/sysroot_wrapper/setup.sh b/binary_search_tool/sysroot_wrapper/setup.sh index 6b9b48f1..f9ecb0ea 100755 --- a/binary_search_tool/sysroot_wrapper/setup.sh +++ b/binary_search_tool/sysroot_wrapper/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -u # -# Copyright 2021 The Chromium OS Authors. All rights reserved. +# Copyright 2021 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/binary_search_tool/sysroot_wrapper/test_setup_host.sh b/binary_search_tool/sysroot_wrapper/test_setup_host.sh index b5169eee..e61bc367 100755 --- a/binary_search_tool/sysroot_wrapper/test_setup_host.sh +++ b/binary_search_tool/sysroot_wrapper/test_setup_host.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2017 Google Inc. All Rights Reserved. +# Copyright 2017 Google LLC # # This is a generic ChromeOS package/image test setup script. It is meant to # be used for either the object file or package bisection tools. This script diff --git a/binary_search_tool/sysroot_wrapper/testing_test.py b/binary_search_tool/sysroot_wrapper/testing_test.py index b5ceec1f..af884be9 100755 --- a/binary_search_tool/sysroot_wrapper/testing_test.py +++ b/binary_search_tool/sysroot_wrapper/testing_test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# 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,32 +11,35 @@ chromeos-chrome built for a daisy board, if you are using another package you will need to change the base_path accordingly. """ -from __future__ import print_function import subprocess import sys import os -base_path = ('/var/cache/chromeos-chrome/chrome-src-internal/src/out_daisy/' - 'Release/obj/') +base_path = ( + "/var/cache/chromeos-chrome/chrome-src-internal/src/out_daisy/" + "Release/obj/" +) bad_files = [ - os.path.join(base_path, 'base/base.cpu.o'), - os.path.join(base_path, 'base/base.version.o'), - os.path.join(base_path, 'apps/apps.launcher.o') + os.path.join(base_path, "base/base.cpu.o"), + os.path.join(base_path, "base/base.version.o"), + os.path.join(base_path, "apps/apps.launcher.o"), ] -bisect_dir = os.environ.get('BISECT_DIR', '/tmp/sysroot_bisect') +bisect_dir = os.environ.get("BISECT_DIR", "/tmp/sysroot_bisect") def Main(_): - for test_file in bad_files: - test_file = test_file.strip() - cmd = ['grep', test_file, os.path.join(bisect_dir, 'BAD_SET')] - ret = subprocess.call(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - if not ret: - return 1 - return 0 - - -if __name__ == '__main__': - sys.exit(Main(sys.argv[1:])) + for test_file in bad_files: + test_file = test_file.strip() + cmd = ["grep", test_file, os.path.join(bisect_dir, "BAD_SET")] + ret = subprocess.call( + cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) + if not ret: + return 1 + return 0 + + +if __name__ == "__main__": + sys.exit(Main(sys.argv[1:])) |