From c7759c7784165b84f3dccf67192c440a9fc444d6 Mon Sep 17 00:00:00 2001 From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> Date: Thu, 26 Dec 2024 09:12:18 -0500 Subject: [PATCH] Update device check in download_trusty_symbols_if_needed (#4475) (#4545) The device check is updated to use find instead of a literal match so that sanitized version of the devices (e.g: cheetah_hwasan) can also be used --------- Cherry pick: https://github.com/google/clusterfuzz/pull/4256 Co-authored-by: svasudevprasad <151788366+svasudevprasad@users.noreply.github.com> --- .../_internal/platforms/android/symbols_downloader.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/clusterfuzz/_internal/platforms/android/symbols_downloader.py b/src/clusterfuzz/_internal/platforms/android/symbols_downloader.py index b60685e5fe..f45355cf73 100644 --- a/src/clusterfuzz/_internal/platforms/android/symbols_downloader.py +++ b/src/clusterfuzz/_internal/platforms/android/symbols_downloader.py @@ -180,10 +180,12 @@ def download_trusty_symbols_if_needed(symbols_directory, app_name, bid): """Downloads and extracts Trusted App ELF files""" ab_target = '' device = settings.get_build_parameters().get('target') - if device in ['cheetah', 'panther']: + if 'cheetah' in device or 'panther' in device: ab_target = 'cloudripper-fuzz-test-debug' - if device in ['oriole', 'raven', 'bluejay']: + elif 'oriole' in device or 'raven' in device or 'bluejay' in device: ab_target = 'slider-fuzz-test-debug' + else: + logs.error(f'Unsupported device {device}.') branch = 'polygon-trusty-whitechapel-master' if not bid: