From 7536fb0b490547784b00c7c7814cce18981690d9 Mon Sep 17 00:00:00 2001 From: Madhura Jayaraman Date: Thu, 1 Aug 2024 09:26:03 -0700 Subject: [PATCH] Add SB17 builders (#3919) b/355449840 --- .github/config/evergreen-arm-hardfp.json | 12 +++++++++++- .github/config/evergreen-arm-softfp.json | 12 +++++++++++- .github/config/evergreen-arm64.json | 11 ++++++++++- .github/config/evergreen-x64.json | 11 ++++++++++- .github/config/linux.json | 9 ++++++++- .github/config/raspi-2.json | 11 ++++++++++- .../tools/api_leak_detector/api_leak_detector.py | 8 ++++---- 7 files changed, 64 insertions(+), 10 deletions(-) diff --git a/.github/config/evergreen-arm-hardfp.json b/.github/config/evergreen-arm-hardfp.json index 7a0509c96899c..113fd11ab46fc 100644 --- a/.github/config/evergreen-arm-hardfp.json +++ b/.github/config/evergreen-arm-hardfp.json @@ -14,7 +14,8 @@ "platforms": [ "evergreen-arm-hardfp", "evergreen-arm-hardfp-sbversion-15", - "evergreen-arm-hardfp-sbversion-16" + "evergreen-arm-hardfp-sbversion-16", + "evergreen-arm-hardfp-sbversion-17" ], "includes": [ { @@ -43,6 +44,15 @@ "extra_gn_arguments":"use_asan=false", "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false", "sb_api_version": "16" + }, + { + "name":"sbversion-17", + "platform":"evergreen-arm-hardfp-sbversion-17", + "target_platform":"evergreen-arm-hardfp", + "target_cpu":"target_cpu=\\\"arm\\\"", + "extra_gn_arguments":"use_asan=false", + "evergreen_loader_extra_gn_arguments":"use_asan=false is_clang=false", + "sb_api_version": "17" } ] } diff --git a/.github/config/evergreen-arm-softfp.json b/.github/config/evergreen-arm-softfp.json index b209ead419e01..0594f2d36bf92 100644 --- a/.github/config/evergreen-arm-softfp.json +++ b/.github/config/evergreen-arm-softfp.json @@ -14,7 +14,8 @@ "platforms": [ "evergreen-arm-softfp", "evergreen-arm-softfp-sbversion-15", - "evergreen-arm-softfp-sbversion-16" + "evergreen-arm-softfp-sbversion-16", + "evergreen-arm-softfp-sbversion-17" ], "includes": [ { @@ -42,6 +43,15 @@ "extra_gn_arguments":"use_asan=false", "sb_api_version":"16", "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" + }, + { + "name":"sbversion-17", + "platform":"evergreen-arm-softfp-sbversion-17", + "target_platform":"evergreen-arm-softfp", + "target_cpu":"target_cpu=\\\"arm\\\"", + "extra_gn_arguments":"use_asan=false", + "sb_api_version":"17", + "evergreen_loader_extra_gn_arguments": "target_os=\\\"android\\\" sb_is_evergreen_compatible=true" } ] } diff --git a/.github/config/evergreen-arm64.json b/.github/config/evergreen-arm64.json index 6dd75d18580a5..eb7f5bbd32723 100644 --- a/.github/config/evergreen-arm64.json +++ b/.github/config/evergreen-arm64.json @@ -3,7 +3,8 @@ "platforms": [ "evergreen-arm64", "evergreen-arm64-sbversion-15", - "evergreen-arm64-sbversion-16" + "evergreen-arm64-sbversion-16", + "evergreen-arm64-sbversion-17" ], "includes": [ { @@ -28,6 +29,14 @@ "target_cpu":"target_cpu=\\\"arm64\\\"", "extra_gn_arguments":"use_asan=false", "sb_api_version":"16" + }, + { + "name":"sbversion-17", + "platform":"evergreen-arm64-sbversion-17", + "target_platform":"evergreen-arm64", + "target_cpu":"target_cpu=\\\"arm64\\\"", + "extra_gn_arguments":"use_asan=false", + "sb_api_version":"17" } ] } diff --git a/.github/config/evergreen-x64.json b/.github/config/evergreen-x64.json index 79e6aa6afed63..21bc0e7139714 100644 --- a/.github/config/evergreen-x64.json +++ b/.github/config/evergreen-x64.json @@ -6,7 +6,8 @@ "platforms": [ "evergreen-x64", "evergreen-x64-sbversion-15", - "evergreen-x64-sbversion-16" + "evergreen-x64-sbversion-16", + "evergreen-x64-sbversion-17" ], "includes": [ { @@ -31,6 +32,14 @@ "target_cpu":"target_cpu=\\\"x64\\\"", "extra_gn_arguments":"use_asan=false", "sb_api_version":"16" + }, + { + "name":"sbversion-17", + "platform":"evergreen-x64-sbversion-17", + "target_platform":"evergreen-x64", + "target_cpu":"target_cpu=\\\"x64\\\"", + "extra_gn_arguments":"use_asan=false", + "sb_api_version":"17" } ] } diff --git a/.github/config/linux.json b/.github/config/linux.json index 6604d271d76cf..4f591b0347966 100644 --- a/.github/config/linux.json +++ b/.github/config/linux.json @@ -8,7 +8,8 @@ "linux-x64x11-egl", "linux-x64x11-skia", "linux-x64x11-sbversion-15", - "linux-x64x11-sbversion-16" + "linux-x64x11-sbversion-16", + "linux-x64x11-sbversion-17" ], "includes": [ { @@ -37,6 +38,12 @@ "platform":"linux-x64x11-sbversion-16", "target_platform":"linux-x64x11", "sb_api_version":"16" + }, + { + "name":"sbversion-17", + "platform":"linux-x64x11-sbversion-17", + "target_platform":"linux-x64x11", + "sb_api_version":"17" } ] } diff --git a/.github/config/raspi-2.json b/.github/config/raspi-2.json index 03f722031e902..1df9213251b94 100644 --- a/.github/config/raspi-2.json +++ b/.github/config/raspi-2.json @@ -14,7 +14,8 @@ "platforms": [ "raspi-2", "raspi-2-sbversion-15", - "raspi-2-sbversion-16" + "raspi-2-sbversion-16", + "raspi-2-sbversion-17" ], "includes": [ { @@ -39,6 +40,14 @@ "target_cpu":"target_cpu=\\\"arm\\\"", "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false", "sb_api_version": "16" + }, + { + "name":"sbversion-17", + "platform":"raspi-2-sbversion-17", + "target_platform":"raspi-2", + "target_cpu":"target_cpu=\\\"arm\\\"", + "extra_gn_arguments": "build_with_separate_cobalt_toolchain=true use_asan=false", + "sb_api_version": "17" } ] } diff --git a/starboard/tools/api_leak_detector/api_leak_detector.py b/starboard/tools/api_leak_detector/api_leak_detector.py index ab667b620b773..cdfe27f997523 100755 --- a/starboard/tools/api_leak_detector/api_leak_detector.py +++ b/starboard/tools/api_leak_detector/api_leak_detector.py @@ -62,7 +62,7 @@ _DEFAULT_PLATFORM = 'evergreen-x64' _DEFAULT_CONFIG = 'gold' _DEFAULT_TARGET = 'cobalt' -_DEFAULT_SB_VERSION = 16 +_DEFAULT_SB_VERSION = 17 _RE_LIB = re.compile(r'lib.*\.a$') _RE_FILE = re.compile(r'\/\/.*\.[hcp]+$') @@ -86,7 +86,7 @@ _UNKNOWN_SOURCE_FILES = 'unknown_source_file(s)' # Allowed POSIX symbols in Starboard 16 -_ALLOWED_SB16_POSIX_SYMBOLS = [ +_ALLOWED_SB_GE_16_POSIX_SYMBOLS = [ '__errno_location', 'accept', 'bind', @@ -488,8 +488,8 @@ def IsSbSymbol(symbol): return symbol.startswith('Sb') or symbol.startswith('kSb') def IsAllowedPosixSymbol(symbol, sb_api_version: int): - if sb_api_version == 16: - return symbol in _ALLOWED_SB16_POSIX_SYMBOLS + if sb_api_version in [16, 17]: + return symbol in _ALLOWED_SB_GE_16_POSIX_SYMBOLS else: return False