Skip to content

Commit

Permalink
Add SB17 builders (#3919)
Browse files Browse the repository at this point in the history
b/355449840
  • Loading branch information
madhurajayaraman committed Aug 1, 2024
1 parent df7c2ac commit 7536fb0
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 10 deletions.
12 changes: 11 additions & 1 deletion .github/config/evergreen-arm-hardfp.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down Expand Up @@ -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"
}
]
}
12 changes: 11 additions & 1 deletion .github/config/evergreen-arm-softfp.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down Expand Up @@ -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"
}
]
}
11 changes: 10 additions & 1 deletion .github/config/evergreen-arm64.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"platforms": [
"evergreen-arm64",
"evergreen-arm64-sbversion-15",
"evergreen-arm64-sbversion-16"
"evergreen-arm64-sbversion-16",
"evergreen-arm64-sbversion-17"
],
"includes": [
{
Expand All @@ -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"
}
]
}
11 changes: 10 additions & 1 deletion .github/config/evergreen-x64.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"platforms": [
"evergreen-x64",
"evergreen-x64-sbversion-15",
"evergreen-x64-sbversion-16"
"evergreen-x64-sbversion-16",
"evergreen-x64-sbversion-17"
],
"includes": [
{
Expand All @@ -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"
}
]
}
9 changes: 8 additions & 1 deletion .github/config/linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down Expand Up @@ -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"
}
]
}
11 changes: 10 additions & 1 deletion .github/config/raspi-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"platforms": [
"raspi-2",
"raspi-2-sbversion-15",
"raspi-2-sbversion-16"
"raspi-2-sbversion-16",
"raspi-2-sbversion-17"
],
"includes": [
{
Expand All @@ -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"
}
]
}
8 changes: 4 additions & 4 deletions starboard/tools/api_leak_detector/api_leak_detector.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]+$')
Expand All @@ -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',
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 7536fb0

Please sign in to comment.