diff --git a/.github/workflows/evergreen.yaml b/.github/workflows/evergreen.yaml index 8e60d8ecc743..13005138cfd5 100644 --- a/.github/workflows/evergreen.yaml +++ b/.github/workflows/evergreen.yaml @@ -49,15 +49,6 @@ jobs: platform: evergreen-arm-softfp nightly: ${{ github.event.inputs.nightly }} run_api_leak_detector: true - evergreen-arm-softfp-no-loader: - uses: ./.github/workflows/main.yaml - permissions: - packages: write - pull-requests: write - with: - platform: evergreen-arm-softfp-no-loader - nightly: ${{ github.event.inputs.nightly }} - run_api_leak_detector: true evergreen-arm64: uses: ./.github/workflows/main.yaml permissions: diff --git a/cobalt/h5vcc/h5vcc_system.cc b/cobalt/h5vcc/h5vcc_system.cc index a9e7753d0f08..9053ad934ba7 100644 --- a/cobalt/h5vcc/h5vcc_system.cc +++ b/cobalt/h5vcc/h5vcc_system.cc @@ -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 { diff --git a/cobalt/updater/updater_module.cc b/cobalt/updater/updater_module.cc index 5de4bb6feead..883f5f93fbd6 100644 --- a/cobalt/updater/updater_module.cc +++ b/cobalt/updater/updater_module.cc @@ -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; } diff --git a/media/base/starboard_utils.cc b/media/base/starboard_utils.cc index c175785577ea..f932a063ea8f 100644 --- a/media/base/starboard_utils.cc +++ b/media/base/starboard_utils.cc @@ -381,12 +381,6 @@ SbMediaColorMetadata MediaToSbMediaColorMetadata( sb_media_color_metadata.matrix = static_cast(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(color_space.range); // TODO(b/230915942): Revisit to see if we have to support custom primary id. diff --git a/starboard/android/shared/BUILD.gn b/starboard/android/shared/BUILD.gn index 0b68a1ac2170..246052a49096 100644 --- a/starboard/android/shared/BUILD.gn +++ b/starboard/android/shared/BUILD.gn @@ -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", diff --git a/starboard/android/shared/system_get_connection_type.cc b/starboard/android/shared/system_get_connection_type.cc deleted file mode 100644 index 7b3d2bf55d42..000000000000 --- a/starboard/android/shared/system_get_connection_type.cc +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2016 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "starboard/system.h" - -#if SB_API_VERSION < 14 - -#include "starboard/android/shared/jni_env_ext.h" -#include "starboard/common/log.h" - -using starboard::android::shared::JniEnvExt; - -SbSystemConnectionType SbSystemGetConnectionType() { - JniEnvExt* env = JniEnvExt::Get(); - jboolean isWireless = - env->CallStarboardBooleanMethodOrAbort("isCurrentNetworkWireless", "()Z"); - - if (isWireless) { - return kSbSystemConnectionTypeWireless; - } else { - return kSbSystemConnectionTypeWired; - } -} - -#endif // SB_API_VERSION < 14 diff --git a/starboard/android/shared/system_get_path.cc b/starboard/android/shared/system_get_path.cc index 22d64edb4411..139318d0c7f2 100644 --- a/starboard/android/shared/system_get_path.cc +++ b/starboard/android/shared/system_get_path.cc @@ -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. diff --git a/starboard/elf_loader/exported_symbols.cc b/starboard/elf_loader/exported_symbols.cc index 40e4ffb95988..b378a2c551ae 100644 --- a/starboard/elf_loader/exported_symbols.cc +++ b/starboard/elf_loader/exported_symbols.cc @@ -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 diff --git a/starboard/extension/updater_notification.h b/starboard/extension/updater_notification.h index 8d9521fafca9..737052ca6717 100644 --- a/starboard/extension/updater_notification.h +++ b/starboard/extension/updater_notification.h @@ -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 { diff --git a/starboard/linux/shared/BUILD.gn b/starboard/linux/shared/BUILD.gn index 1303212c63ab..912ef0706f6a 100644 --- a/starboard/linux/shared/BUILD.gn +++ b/starboard/linux/shared/BUILD.gn @@ -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", diff --git a/starboard/linux/shared/system_get_connection_type.cc b/starboard/linux/shared/system_get_connection_type.cc deleted file mode 100644 index 8042f3d60d0c..000000000000 --- a/starboard/linux/shared/system_get_connection_type.cc +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2016 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "starboard/system.h" - -#if SB_API_VERSION < 14 - -#include "starboard/linux/shared/routes.h" - -using starboard::shared::Routes; - -SbSystemConnectionType SbSystemGetConnectionType() { - Routes routes; - - if (!routes.RequestDump()) { - return kSbSystemConnectionTypeUnknown; - } - - // Find the top priority route and return if the corresponding route uses a - // wireless interface. - int priority = INT_MAX; - bool is_wireless = false; - while (auto route = routes.GetNextRoute()) { - if (Routes::IsDefaultRoute(*route)) { - if (route->priority < priority) { - priority = route->priority; - is_wireless = Routes::IsWirelessInterface(*route); - } - } - } - if (priority != INT_MAX) - return is_wireless ? kSbSystemConnectionTypeWireless - : kSbSystemConnectionTypeWired; - return kSbSystemConnectionTypeUnknown; -} - -#endif // SB_API_VERSION < 14 diff --git a/starboard/linux/shared/system_get_extensions.cc b/starboard/linux/shared/system_get_extensions.cc index ede9b7bc987f..454bf3abe3f8 100644 --- a/starboard/linux/shared/system_get_extensions.cc +++ b/starboard/linux/shared/system_get_extensions.cc @@ -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(); diff --git a/starboard/linux/shared/system_get_path.cc b/starboard/linux/shared/system_get_path.cc index 7231e872d124..4d0e125e28f5 100644 --- a/starboard/linux/shared/system_get_path.cc +++ b/starboard/linux/shared/system_get_path.cc @@ -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); diff --git a/starboard/nplb/BUILD.gn b/starboard/nplb/BUILD.gn index 04ceafbe07c1..4d180b56e2c9 100644 --- a/starboard/nplb/BUILD.gn +++ b/starboard/nplb/BUILD.gn @@ -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", diff --git a/starboard/nplb/nplb_evergreen_compat_tests/sabi_test.cc b/starboard/nplb/nplb_evergreen_compat_tests/sabi_test.cc index aa277e36b9f9..47d1991d0b0c 100644 --- a/starboard/nplb/nplb_evergreen_compat_tests/sabi_test.cc +++ b/starboard/nplb/nplb_evergreen_compat_tests/sabi_test.cc @@ -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," diff --git a/starboard/nplb/system_get_connection_type_test.cc b/starboard/nplb/system_get_connection_type_test.cc deleted file mode 100644 index 3677b10081ba..000000000000 --- a/starboard/nplb/system_get_connection_type_test.cc +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2021 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Here we are not trying to do anything fancy, just to really sanity check that -// this is hooked up to something. - -#include "starboard/common/log.h" -#include "starboard/common/string.h" -#include "starboard/system.h" -#include "testing/gtest/include/gtest/gtest.h" - -#if SB_API_VERSION < 14 - -namespace starboard { -namespace nplb { -namespace { - -TEST(SbSystemGetConnectionTypeTest, SunnyDay) { - SbSystemConnectionType type = SbSystemGetConnectionType(); -} - -TEST(SbSystemGetConnectionTypeTest, ConnectionIsKnown) { - SbSystemConnectionType type = SbSystemGetConnectionType(); - EXPECT_NE(type, kSbSystemConnectionTypeUnknown); -} - -TEST(SbSystemGetConnectionTypeTest, ConnectionIsWiredOrWireless) { - SbSystemConnectionType type = SbSystemGetConnectionType(); - EXPECT_TRUE(type == kSbSystemConnectionTypeWired || - type == kSbSystemConnectionTypeWireless); -} - -} // namespace -} // namespace nplb -} // namespace starboard - -#endif // SB_API_VERSION < 14 diff --git a/starboard/nplb/system_get_path_test.cc b/starboard/nplb/system_get_path_test.cc index 2a7dd97f74ea..2f13412d46a2 100644 --- a/starboard/nplb/system_get_path_test.cc +++ b/starboard/nplb/system_get_path_test.cc @@ -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__); @@ -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__); diff --git a/starboard/raspi/shared/BUILD.gn b/starboard/raspi/shared/BUILD.gn index 3988122640b7..8b871982d677 100644 --- a/starboard/raspi/shared/BUILD.gn +++ b/starboard/raspi/shared/BUILD.gn @@ -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", diff --git a/starboard/shared/stub/system_get_connection_type.cc b/starboard/shared/stub/system_get_connection_type.cc deleted file mode 100644 index 49de2c4323ad..000000000000 --- a/starboard/shared/stub/system_get_connection_type.cc +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "starboard/system.h" - -#if SB_API_VERSION < 14 - -SbSystemConnectionType SbSystemGetConnectionType() { - return kSbSystemConnectionTypeUnknown; -} - -#endif // SB_API_VERSION < 14 diff --git a/starboard/shared/uwp/media_is_video_supported.cc b/starboard/shared/uwp/media_is_video_supported.cc index e19e13997db4..3654764ad6e6 100644 --- a/starboard/shared/uwp/media_is_video_supported.cc +++ b/starboard/shared/uwp/media_is_video_supported.cc @@ -213,15 +213,6 @@ class XboxVideoCapabilities { return is_supported; } -#if SB_API_VERSION < 14 - // AV1 decoder only supports YUVI420 compact texture format. The new format - // is only supported after - // 14. - if (codec == kSbMediaVideoCodecAv1) { - return false; - } -#endif // SB_API_VERSION >= 14 - is_supported &= ApplicationUwp::Get()->IsHdrSupported(); is_supported &= bit_depth == 10; is_supported &= primary_id == kSbMediaPrimaryIdBt2020; diff --git a/starboard/stub/BUILD.gn b/starboard/stub/BUILD.gn index db0ccd7dc6c3..25a66ce8f5a7 100644 --- a/starboard/stub/BUILD.gn +++ b/starboard/stub/BUILD.gn @@ -205,7 +205,6 @@ static_library("stub_sources") { "//starboard/shared/stub/system_break_into_debugger.cc", "//starboard/shared/stub/system_clear_last_error.cc", "//starboard/shared/stub/system_egl.cc", - "//starboard/shared/stub/system_get_connection_type.cc", "//starboard/shared/stub/system_get_device_type.cc", "//starboard/shared/stub/system_get_error_string.cc", "//starboard/shared/stub/system_get_last_error.cc", diff --git a/starboard/system.h b/starboard/system.h index b87b5a30b19e..e28bd66abec3 100644 --- a/starboard/system.h +++ b/starboard/system.h @@ -58,11 +58,6 @@ typedef enum SbSystemPathId { // Path to a directory where temporary files can be written. kSbSystemPathTempDirectory, -#if SB_API_VERSION < 14 - // Path to a directory where test results can be written. - kSbSystemPathTestOutputDirectory, -#endif // #if SB_API_VERSION < 14 - // Full path to the executable file. kSbSystemPathExecutableFile, @@ -176,20 +171,6 @@ typedef enum SbSystemDeviceType { } SbSystemDeviceType; #endif // SB_API_VERSION < 15 -#if SB_API_VERSION < 14 -// Enumeration of network connection types. -typedef enum SbSystemConnectionType { - // The system is on a wired connection. - kSbSystemConnectionTypeWired, - - // The system is on a wireless connection. - kSbSystemConnectionTypeWireless, - - // The system connection type is unknown. - kSbSystemConnectionTypeUnknown, -} SbSystemConnectionType; -#endif // SB_API_VERSION < 14 - // Runtime capabilities are boolean properties of a platform that can't be // determined at compile-time. They may vary from device to device, but they // will not change over the course of a single execution. They often specify @@ -312,11 +293,6 @@ SB_EXPORT int64_t SbSystemGetUsedGPUMemory(); SB_EXPORT SbSystemDeviceType SbSystemGetDeviceType(); #endif -#if SB_API_VERSION < 14 -// Returns the device's current network connection type. -SB_EXPORT SbSystemConnectionType SbSystemGetConnectionType(); -#endif // SB_API_VERSION < 14 - // Returns if the device is disconnected from network. "Disconnected" is chosen // over connected because disconnection can be determined with more certainty // than connection usually.