mirror of
https://chromium.googlesource.com/libyuv/libyuv
synced 2025-12-06 16:56:55 +08:00
Fix mac_asan bot by using right architecture for dsymutil
This broke in https://crrev.com/c/7041203 when we switched mac_asan to use arm64, but didn't change the dsymutil binary. Let's fix by adopting the approach of chromium/src, which works for both archs. https://source.chromium.org/chromium/chromium/src/+/main:DEPS;l=4243-4267;drc=bd6571ed43a1025fa5122e31db929ccb69df6ce1 Bug: 448679376 Change-Id: I7f43b4ce7ad3a3946080f4c5bcbca32d6cbc4c5c Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/7050423 Commit-Queue: Victor Vianna <victorvianna@google.com> Reviewed-by: Frank Barchard <fbarchard@chromium.org>
This commit is contained in:
parent
1f62f14950
commit
738a53ce27
36
DEPS
36
DEPS
@ -235,16 +235,6 @@ deps = {
|
|||||||
'condition': 'checkout_android and non_git_source',
|
'condition': 'checkout_android and non_git_source',
|
||||||
'dep_type': 'cipd',
|
'dep_type': 'cipd',
|
||||||
},
|
},
|
||||||
'src/tools/clang/dsymutil': {
|
|
||||||
'packages': [
|
|
||||||
{
|
|
||||||
'package': 'chromium/llvm-build-tools/dsymutil',
|
|
||||||
'version': 'OWlhXkmj18li3yhJk59Kmjbc5KdgLh56TwCd1qBdzlIC',
|
|
||||||
}
|
|
||||||
],
|
|
||||||
'condition': 'checkout_mac',
|
|
||||||
'dep_type': 'cipd',
|
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
'src/third_party/android_build_tools/aapt2/cipd': {
|
'src/third_party/android_build_tools/aapt2/cipd': {
|
||||||
@ -1654,6 +1644,32 @@ hooks = [
|
|||||||
Var('rbe_instance'),
|
Var('rbe_instance'),
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
'name': 'dsymutil_mac_arm64',
|
||||||
|
'pattern': '.',
|
||||||
|
'condition': 'host_os == "mac" and host_cpu == "arm64"',
|
||||||
|
'action': [ 'python3',
|
||||||
|
'src/third_party/depot_tools/download_from_google_storage.py',
|
||||||
|
'--no_resume',
|
||||||
|
'--no_auth',
|
||||||
|
'--bucket', 'chromium-browser-clang',
|
||||||
|
'-s', 'src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1',
|
||||||
|
'-o', 'src/tools/clang/dsymutil/bin/dsymutil',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'name': 'dsymutil_mac_x64',
|
||||||
|
'pattern': '.',
|
||||||
|
'condition': 'host_os == "mac" and host_cpu == "x64"',
|
||||||
|
'action': [ 'python3',
|
||||||
|
'src/third_party/depot_tools/download_from_google_storage.py',
|
||||||
|
'--no_resume',
|
||||||
|
'--no_auth',
|
||||||
|
'--bucket', 'chromium-browser-clang',
|
||||||
|
'-s', 'src/tools/clang/dsymutil/bin/dsymutil.x64.sha1',
|
||||||
|
'-o', 'src/tools/clang/dsymutil/bin/dsymutil',
|
||||||
|
],
|
||||||
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
recursedeps = [
|
recursedeps = [
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user