Skip to content

Commit

Permalink
Remove Starboard version 13
Browse files Browse the repository at this point in the history
b/293645066
  • Loading branch information
oxve committed Apr 19, 2024
1 parent a26b902 commit 0b47713
Show file tree
Hide file tree
Showing 21 changed files with 1 addition and 305 deletions.
4 changes: 0 additions & 4 deletions cobalt/h5vcc/h5vcc_system.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
#include "starboard/common/system_property.h"
#include "starboard/system.h"

#if SB_API_VERSION < 14
#include "starboard/extension/ifa.h"
#endif // SB_API_VERSION < 14

using starboard::kSystemPropertyMaxLength;

namespace cobalt {
Expand Down
9 changes: 0 additions & 9 deletions cobalt/updater/updater_module.cc
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,12 @@ ComponentStateToCobaltExtensionUpdaterNotificationState(
return kCobaltExtensionUpdaterNotificationStateDownloaded;
case ComponentState::kUpdating:
return kCobaltExtensionUpdaterNotificationStateInstalling;
#if SB_API_VERSION > 13
case ComponentState::kUpdated:
return kCobaltExtensionUpdaterNotificationStateUpdated;
case ComponentState::kUpToDate:
return kCobaltExtensionUpdaterNotificationStateUpToDate;
case ComponentState::kUpdateError:
return kCobaltExtensionUpdaterNotificationStateUpdateFailed;
#else
case ComponentState::kUpdated:
return kCobaltExtensionUpdaterNotificationStatekUpdated;
case ComponentState::kUpToDate:
return kCobaltExtensionUpdaterNotificationStatekUpToDate;
case ComponentState::kUpdateError:
return kCobaltExtensionUpdaterNotificationStatekUpdateFailed;
#endif
default:
return kCobaltExtensionUpdaterNotificationStateNone;
}
Expand Down
6 changes: 0 additions & 6 deletions media/base/starboard_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -381,12 +381,6 @@ SbMediaColorMetadata MediaToSbMediaColorMetadata(
sb_media_color_metadata.matrix =
static_cast<SbMediaMatrixId>(color_space.matrix);

#if SB_API_VERSION < 14
if (color_space.matrix == VideoColorSpace::MatrixID::INVALID) {
sb_media_color_metadata.matrix = kSbMediaMatrixIdUnknown;
}
#endif // SB_API_VERSION < 14

sb_media_color_metadata.range =
static_cast<SbMediaRangeId>(color_space.range);
// TODO(b/230915942): Revisit to see if we have to support custom primary id.
Expand Down
1 change: 0 additions & 1 deletion starboard/android/shared/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,6 @@ static_library("starboard_platform") {
"speech_synthesis_internal.cc",
"speech_synthesis_is_supported.cc",
"speech_synthesis_speak.cc",
"system_get_connection_type.cc",
"system_get_device_type.cc",
"system_get_extensions.cc",
"system_get_locale_id.cc",
Expand Down
36 changes: 0 additions & 36 deletions starboard/android/shared/system_get_connection_type.cc

This file was deleted.

7 changes: 0 additions & 7 deletions starboard/android/shared/system_get_path.cc
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,6 @@ bool SbSystemGetPath(SbSystemPathId path_id, char* out_path, int path_size) {
break;
}

#if SB_API_VERSION < 14
case kSbSystemPathTestOutputDirectory: {
return SbSystemGetPath(kSbSystemPathDebugOutputDirectory, out_path,
path_size);
}
#endif

// We return the library directory as the "executable" since:
// a) Unlike the .so itself, it has a valid timestamp of the app install.
// b) Its parent directory is still a directory within our app package.
Expand Down
3 changes: 0 additions & 3 deletions starboard/elf_loader/exported_symbols.cc
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,6 @@ ExportedSymbols::ExportedSymbols() {
#endif // SB_API_VERSION < 16
REGISTER_SYMBOL(SbSystemBreakIntoDebugger);
REGISTER_SYMBOL(SbSystemClearLastError);
#if SB_API_VERSION < 14
REGISTER_SYMBOL(SbSystemGetConnectionType);
#endif
#if SB_API_VERSION < 15
REGISTER_SYMBOL(SbSystemGetDeviceType);
#endif
Expand Down
7 changes: 1 addition & 6 deletions starboard/extension/updater_notification.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,10 @@ typedef enum CobaltExtensionUpdaterNotificationState {
kCobaltExtensionUpdaterNotificationStateDownloading = 3,
kCobaltExtensionUpdaterNotificationStateDownloaded = 4,
kCobaltExtensionUpdaterNotificationStateInstalling = 5,
#if SB_API_VERSION > 13
kCobaltExtensionUpdaterNotificationStateUpdated = 6,
kCobaltExtensionUpdaterNotificationStateUpToDate = 7,
kCobaltExtensionUpdaterNotificationStateUpdateFailed = 8,
#else
kCobaltExtensionUpdaterNotificationStatekUpdated = 6,
kCobaltExtensionUpdaterNotificationStatekUpToDate = 7,
kCobaltExtensionUpdaterNotificationStatekUpdateFailed = 8,
#endif

} CobaltExtensionUpdaterNotificationState;

typedef struct CobaltExtensionUpdaterNotificationApi {
Expand Down
1 change: 0 additions & 1 deletion starboard/linux/shared/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ static_library("starboard_platform_sources") {
"//starboard/linux/shared/routes.h",
"//starboard/linux/shared/soft_mic_platform_service.cc",
"//starboard/linux/shared/soft_mic_platform_service.h",
"//starboard/linux/shared/system_get_connection_type.cc",
"//starboard/linux/shared/system_get_device_type.cc",
"//starboard/linux/shared/system_get_extensions.cc",
"//starboard/linux/shared/system_get_path.cc",
Expand Down
48 changes: 0 additions & 48 deletions starboard/linux/shared/system_get_connection_type.cc

This file was deleted.

5 changes: 0 additions & 5 deletions starboard/linux/shared/system_get_extensions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,6 @@ const void* SbSystemGetExtension(const char* name) {
if (strcmp(name, kStarboardExtensionTimeZoneName) == 0) {
return starboard::shared::GetTimeZoneApi();
}
#if SB_API_VERSION < 14
if (strcmp(name, kStarboardExtensionIfaName) == 0) {
return starboard::shared::GetIfaApi();
}
#endif // SB_API_VERSION < 14
#if SB_IS(EVERGREEN_COMPATIBLE)
if (strcmp(name, kStarboardExtensionLoaderAppMetricsName) == 0) {
return starboard::shared::starboard::GetLoaderAppMetricsApi();
Expand Down
6 changes: 0 additions & 6 deletions starboard/linux/shared/system_get_path.cc
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,6 @@ bool SbSystemGetPath(SbSystemPathId path_id, char* out_path, int path_size) {
mkdir(path.data(), 0700);
break;

#if SB_API_VERSION < 14
case kSbSystemPathTestOutputDirectory:
return SbSystemGetPath(kSbSystemPathDebugOutputDirectory, out_path,
path_size);
#endif // #if SB_API_VERSION < 14

case kSbSystemPathExecutableFile:
return GetExecutablePath(out_path, path_size);

Expand Down
1 change: 0 additions & 1 deletion starboard/nplb/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ target(gtest_target_type, "nplb") {
"string_format_wide_test.cc",
"string_scan_test.cc",
"system_clear_last_error_test.cc",
"system_get_connection_type_test.cc",
"system_get_error_string_test.cc",
"system_get_extension_test.cc",
"system_get_last_error_test.cc",
Expand Down
60 changes: 0 additions & 60 deletions starboard/nplb/nplb_evergreen_compat_tests/sabi_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,66 +28,6 @@ namespace nplb_evergreen_compat_tests {

namespace {

#if SB_API_VERSION == 13
const char* kSabiJsonIdArmHardfp =
"{\"alignment_char\":1,\"alignment_double\":8,\"alignment_float\":4,"
"\"alignment_int\":4,\"alignment_llong\":8,\"alignment_long\":4,"
"\"alignment_pointer\":4,\"alignment_short\":2,\"calling_convention\":"
"\"eabi\",\"endianness\":\"little\",\"floating_point_abi\":\"hard\","
"\"floating_point_fpu\":\"vfpv3\",\"sb_api_version\":13,\"signedness_of_"
"char\":\"signed\",\"signedness_of_enum\":\"signed\",\"size_of_char\":1,"
"\"size_of_double\":8,\"size_of_enum\":4,\"size_of_float\":4,\"size_of_"
"int\":4,\"size_of_llong\":8,\"size_of_long\":4,\"size_of_pointer\":4,"
"\"size_of_short\":2,\"target_arch\":\"arm\",\"target_arch_sub\":\"v7a\","
"\"word_size\":32}";

const char* kSabiJsonIdArmSoftfp =
"{\"alignment_char\":1,\"alignment_double\":8,\"alignment_float\":4,"
"\"alignment_int\":4,\"alignment_llong\":8,\"alignment_long\":4,"
"\"alignment_pointer\":4,\"alignment_short\":2,\"calling_convention\":"
"\"eabi\",\"endianness\":\"little\",\"floating_point_abi\":\"softfp\","
"\"floating_point_fpu\":\"vfpv3\",\"sb_api_version\":13,\"signedness_of_"
"char\":\"signed\",\"signedness_of_enum\":\"signed\",\"size_of_char\":1,"
"\"size_of_double\":8,\"size_of_enum\":4,\"size_of_float\":4,\"size_of_"
"int\":4,\"size_of_llong\":8,\"size_of_long\":4,\"size_of_pointer\":4,"
"\"size_of_short\":2,\"target_arch\":\"arm\",\"target_arch_sub\":\"v7a\","
"\"word_size\":32}";

const char* kSabiJsonIdArm64 =
"{\"alignment_char\":1,\"alignment_double\":8,\"alignment_float\":4,"
"\"alignment_int\":4,\"alignment_llong\":8,\"alignment_long\":8,"
"\"alignment_pointer\":8,\"alignment_short\":2,\"calling_convention\":"
"\"aarch64\",\"endianness\":\"little\",\"floating_point_abi\":\"\","
"\"floating_point_fpu\":\"\",\"sb_api_version\":13,\"signedness_of_char\":"
"\"signed\",\"signedness_of_enum\":\"signed\",\"size_of_char\":1,\"size_of_"
"double\":8,\"size_of_enum\":4,\"size_of_float\":4,\"size_of_int\":4,"
"\"size_of_llong\":8,\"size_of_long\":8,\"size_of_pointer\":8,\"size_of_"
"short\":2,\"target_arch\":\"arm64\",\"target_arch_sub\":\"v8a\",\"word_"
"size\":64}";

const char* kSabiJsonIdX86 =
"{\"alignment_char\":1,\"alignment_double\":8,\"alignment_float\":4,"
"\"alignment_int\":4,\"alignment_llong\":8,\"alignment_long\":4,"
"\"alignment_pointer\":4,\"alignment_short\":2,\"calling_convention\":"
"\"sysv\",\"endianness\":\"little\",\"floating_point_abi\":\"\",\"floating_"
"point_fpu\":\"\",\"sb_api_version\":13,\"signedness_of_char\":\"signed\","
"\"signedness_of_enum\":\"signed\",\"size_of_char\":1,\"size_of_double\":8,"
"\"size_of_enum\":4,\"size_of_float\":4,\"size_of_int\":4,\"size_of_"
"llong\":8,\"size_of_long\":4,\"size_of_pointer\":4,\"size_of_short\":2,"
"\"target_arch\":\"x86\",\"target_arch_sub\":\"\",\"word_size\":32}";

const char* kSabiJsonIdX64Sysv =
"{\"alignment_char\":1,\"alignment_double\":8,\"alignment_float\":4,"
"\"alignment_int\":4,\"alignment_llong\":8,\"alignment_long\":8,"
"\"alignment_pointer\":8,\"alignment_short\":2,\"calling_convention\":"
"\"sysv\",\"endianness\":\"little\",\"floating_point_abi\":\"\",\"floating_"
"point_fpu\":\"\",\"sb_api_version\":13,\"signedness_of_char\":\"signed\","
"\"signedness_of_enum\":\"signed\",\"size_of_char\":1,\"size_of_double\":8,"
"\"size_of_enum\":4,\"size_of_float\":4,\"size_of_int\":4,\"size_of_"
"llong\":8,\"size_of_long\":8,\"size_of_pointer\":8,\"size_of_short\":2,"
"\"target_arch\":\"x64\",\"target_arch_sub\":\"\",\"word_size\":64}";
#endif // SB_API_VERSION == 13

#if SB_API_VERSION == 14
const char* kSabiJsonIdArmHardfp =
"{\"alignment_char\":1,\"alignment_double\":8,\"alignment_float\":4,"
Expand Down
48 changes: 0 additions & 48 deletions starboard/nplb/system_get_connection_type_test.cc

This file was deleted.

6 changes: 0 additions & 6 deletions starboard/nplb/system_get_path_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,6 @@ TEST(SbSystemGetPathTest, FailsGracefullyBogusId) {
TEST(SbSystemGetPathTest, DoesNotBlowUpForDefinedIds) {
BasicTest(kSbSystemPathDebugOutputDirectory, false, false, __LINE__);
BasicTest(kSbSystemPathTempDirectory, false, false, __LINE__);
#if SB_API_VERSION < 14
BasicTest(kSbSystemPathTestOutputDirectory, false, false, __LINE__);
#endif // #if SB_API_VERSION < 14
BasicTest(kSbSystemPathCacheDirectory, false, false, __LINE__);
BasicTest(kSbSystemPathFontDirectory, false, false, __LINE__);
BasicTest(kSbSystemPathFontConfigurationDirectory, false, false, __LINE__);
Expand All @@ -117,9 +114,6 @@ TEST(SbSystemGetPathTest, DoesNotBlowUpForDefinedIds) {
TEST(SbSystemGetPathTest, DoesNotTouchOutputBufferOnFailureForDefinedIds) {
UnmodifiedOnFailureTest(kSbSystemPathDebugOutputDirectory, __LINE__);
UnmodifiedOnFailureTest(kSbSystemPathTempDirectory, __LINE__);
#if SB_API_VERSION < 14
UnmodifiedOnFailureTest(kSbSystemPathTestOutputDirectory, __LINE__);
#endif // #if SB_API_VERSION < 14
UnmodifiedOnFailureTest(kSbSystemPathCacheDirectory, __LINE__);
UnmodifiedOnFailureTest(kSbSystemPathFontDirectory, __LINE__);
UnmodifiedOnFailureTest(kSbSystemPathFontConfigurationDirectory, __LINE__);
Expand Down
1 change: 0 additions & 1 deletion starboard/raspi/shared/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ static_library("starboard_platform_sources") {
"//starboard/linux/shared/netlink.h",
"//starboard/linux/shared/routes.cc",
"//starboard/linux/shared/routes.h",
"//starboard/linux/shared/system_get_connection_type.cc",
"//starboard/linux/shared/system_get_path.cc",
"//starboard/linux/shared/system_has_capability.cc",
"//starboard/linux/shared/time_zone.cc",
Expand Down
23 changes: 0 additions & 23 deletions starboard/shared/stub/system_get_connection_type.cc

This file was deleted.

Loading

0 comments on commit 0b47713

Please sign in to comment.