diff --git a/cobalt/extension/configuration.h b/cobalt/extension/configuration.h deleted file mode 100644 index 36f5ae456cf6..000000000000 --- a/cobalt/extension/configuration.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_CONFIGURATION_H_ -#define COBALT_EXTENSION_CONFIGURATION_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/configuration.h" -#else -#error "Extensions have moved, please see CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_CONFIGURATION_H_ diff --git a/cobalt/extension/crash_handler.h b/cobalt/extension/crash_handler.h deleted file mode 100644 index 628c27eea1dd..000000000000 --- a/cobalt/extension/crash_handler.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_CRASH_HANDLER_H_ -#define COBALT_EXTENSION_CRASH_HANDLER_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/crash_handler.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_CRASH_HANDLER_H_ diff --git a/cobalt/extension/demuxer.h b/cobalt/extension/demuxer.h deleted file mode 100644 index 96e210b6fe15..000000000000 --- a/cobalt/extension/demuxer.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_DEMUXER_H_ -#define COBALT_EXTENSION_DEMUXER_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/demuxer.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_DEMUXER_H_ diff --git a/cobalt/extension/font.h b/cobalt/extension/font.h deleted file mode 100644 index 6eaac679eaac..000000000000 --- a/cobalt/extension/font.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_FONT_H_ -#define COBALT_EXTENSION_FONT_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/font.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_FONT_H_ diff --git a/cobalt/extension/free_space.h b/cobalt/extension/free_space.h deleted file mode 100644 index 856cf17cab39..000000000000 --- a/cobalt/extension/free_space.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_FREE_SPACE_H_ -#define COBALT_EXTENSION_FREE_SPACE_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/free_space.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_FREE_SPACE_H_ diff --git a/cobalt/extension/graphics.h b/cobalt/extension/graphics.h deleted file mode 100644 index e7943c942822..000000000000 --- a/cobalt/extension/graphics.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_GRAPHICS_H_ -#define COBALT_EXTENSION_GRAPHICS_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/graphics.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_GRAPHICS_H_ diff --git a/cobalt/extension/installation_manager.h b/cobalt/extension/installation_manager.h deleted file mode 100644 index 97a07579efe5..000000000000 --- a/cobalt/extension/installation_manager.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_INSTALLATION_MANAGER_H_ -#define COBALT_EXTENSION_INSTALLATION_MANAGER_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/installation_manager.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_INSTALLATION_MANAGER_H_ diff --git a/cobalt/extension/javascript_cache.h b/cobalt/extension/javascript_cache.h deleted file mode 100644 index ef58a742b751..000000000000 --- a/cobalt/extension/javascript_cache.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_JAVASCRIPT_CACHE_H_ -#define COBALT_EXTENSION_JAVASCRIPT_CACHE_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/javascript_cache.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_JAVASCRIPT_CACHE_H_ diff --git a/cobalt/extension/media_session.h b/cobalt/extension/media_session.h deleted file mode 100644 index 1aebd300b75d..000000000000 --- a/cobalt/extension/media_session.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_MEDIA_SESSION_H_ -#define COBALT_EXTENSION_MEDIA_SESSION_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/media_session.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_MEDIA_SESSION_H_ diff --git a/cobalt/extension/memory_mapped_file.h b/cobalt/extension/memory_mapped_file.h deleted file mode 100644 index c5ac54c3c517..000000000000 --- a/cobalt/extension/memory_mapped_file.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_MEMORY_MAPPED_FILE_H_ -#define COBALT_EXTENSION_MEMORY_MAPPED_FILE_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/memory_mapped_file.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_MEMORY_MAPPED_FILE_H_ diff --git a/cobalt/extension/platform_service.h b/cobalt/extension/platform_service.h deleted file mode 100644 index fca88ef9aef9..000000000000 --- a/cobalt/extension/platform_service.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_PLATFORM_SERVICE_H_ -#define COBALT_EXTENSION_PLATFORM_SERVICE_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/platform_service.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_PLATFORM_SERVICE_H_ diff --git a/cobalt/extension/updater_notification.h b/cobalt/extension/updater_notification.h deleted file mode 100644 index e56e77dae826..000000000000 --- a/cobalt/extension/updater_notification.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_UPDATER_NOTIFICATION_H_ -#define COBALT_EXTENSION_UPDATER_NOTIFICATION_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/updater_notification.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_UPDATER_NOTIFICATION_H_ diff --git a/cobalt/extension/url_fetcher_observer.h b/cobalt/extension/url_fetcher_observer.h deleted file mode 100644 index 65619d3bbc31..000000000000 --- a/cobalt/extension/url_fetcher_observer.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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. - -#ifndef COBALT_EXTENSION_URL_FETCHER_OBSERVER_H_ -#define COBALT_EXTENSION_URL_FETCHER_OBSERVER_H_ - -#if SB_API_VERSION <= 14 -#include "starboard/extension/url_fetcher_observer.h" -#else -#error "Extensions have moved, please see Starboard CHANGELOG for details." -#endif - -#endif // COBALT_EXTENSION_URL_FETCHER_OBSERVER_H_ diff --git a/starboard/android/shared/BUILD.gn b/starboard/android/shared/BUILD.gn index 9bdb0352196e..52040d577ebf 100644 --- a/starboard/android/shared/BUILD.gn +++ b/starboard/android/shared/BUILD.gn @@ -307,7 +307,6 @@ static_library("starboard_platform") { "speech_synthesis_internal.cc", "speech_synthesis_is_supported.cc", "speech_synthesis_speak.cc", - "system_get_device_type.cc", "system_get_extensions.cc", "system_get_locale_id.cc", "system_get_path.cc", diff --git a/starboard/android/shared/system_get_device_type.cc b/starboard/android/shared/system_get_device_type.cc deleted file mode 100644 index 8c7eb3c0abb8..000000000000 --- a/starboard/android/shared/system_get_device_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 < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - return kSbSystemDeviceTypeAndroidTV; -} - -#endif diff --git a/starboard/linux/shared/BUILD.gn b/starboard/linux/shared/BUILD.gn index eaa3eec457f5..c39d975fdd66 100644 --- a/starboard/linux/shared/BUILD.gn +++ b/starboard/linux/shared/BUILD.gn @@ -87,7 +87,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_device_type.cc", "//starboard/linux/shared/system_get_extensions.cc", "//starboard/linux/shared/system_get_path.cc", "//starboard/linux/shared/system_has_capability.cc", diff --git a/starboard/linux/shared/system_get_device_type.cc b/starboard/linux/shared/system_get_device_type.cc deleted file mode 100644 index ba90dbc08077..000000000000 --- a/starboard/linux/shared/system_get_device_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 < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - return kSbSystemDeviceTypeDesktopPC; -} - -#endif diff --git a/starboard/nplb/posix_compliance/posix_socket_resolve_test.cc b/starboard/nplb/posix_compliance/posix_socket_resolve_test.cc index 3aaed7f969b1..d5a5fcd28590 100644 --- a/starboard/nplb/posix_compliance/posix_socket_resolve_test.cc +++ b/starboard/nplb/posix_compliance/posix_socket_resolve_test.cc @@ -58,7 +58,6 @@ TEST(PosixSocketResolveTest, SunnyDay) { freeaddrinfo(ai); } -#if SB_API_VERSION >= 16 TEST(PosixSocketResolveTest, SunnyDaySocketType) { struct addrinfo hints = {0}; hints.ai_socktype = SOCK_DGRAM; @@ -141,7 +140,6 @@ TEST(PosixSocketResolveTest, SunnyDayProtocol) { freeaddrinfo(ai); } } -#endif // SB_API_VERSION >= 16 TEST(PosixSocketResolveTest, Localhost) { struct addrinfo hints = {0}; diff --git a/starboard/nplb/posix_compliance/posix_socket_waiter_add_test.cc b/starboard/nplb/posix_compliance/posix_socket_waiter_add_test.cc index 8e7de6bfa7b7..b78c204638c8 100644 --- a/starboard/nplb/posix_compliance/posix_socket_waiter_add_test.cc +++ b/starboard/nplb/posix_compliance/posix_socket_waiter_add_test.cc @@ -26,8 +26,6 @@ namespace starboard { namespace nplb { namespace { -#if SB_API_VERSION >= 16 - class SbPosixSocketWaiterAddTest : public ::testing::TestWithParam { public: int GetAddressType() { return GetParam(); } @@ -175,7 +173,6 @@ TEST(SbPosixSocketWaiterAddTest, RainyDayNoInterest) { EXPECT_TRUE(close(socket) == 0); EXPECT_TRUE(SbSocketWaiterDestroy(waiter)); } -#endif // SB_API_VERSION >= 16 } // namespace } // namespace nplb diff --git a/starboard/nplb/posix_compliance/posix_socket_waiter_remove_test.cc b/starboard/nplb/posix_compliance/posix_socket_waiter_remove_test.cc index 881642597558..c64692925249 100644 --- a/starboard/nplb/posix_compliance/posix_socket_waiter_remove_test.cc +++ b/starboard/nplb/posix_compliance/posix_socket_waiter_remove_test.cc @@ -25,8 +25,6 @@ namespace starboard { namespace nplb { namespace { -#if SB_API_VERSION >= 16 - void NoOpSocketWaiterCallback(SbSocketWaiter waiter, int socket, void* context, @@ -78,8 +76,6 @@ TEST(SbPosixSocketWaiterRemoveTest, RainyDayAlreadyRemoved) { EXPECT_TRUE(SbSocketWaiterDestroy(waiter)); } -#endif // SB_API_VERSION >= 16 - } // namespace } // namespace nplb } // namespace starboard diff --git a/starboard/nplb/posix_compliance/posix_socket_waiter_wait_test.cc b/starboard/nplb/posix_compliance/posix_socket_waiter_wait_test.cc index e7db9d70bac1..07c9f2539e9f 100644 --- a/starboard/nplb/posix_compliance/posix_socket_waiter_wait_test.cc +++ b/starboard/nplb/posix_compliance/posix_socket_waiter_wait_test.cc @@ -27,8 +27,6 @@ namespace starboard { namespace nplb { namespace { -#if SB_API_VERSION >= 16 - GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SbPosixSocketWaiterWaitTest); struct CallbackValues { @@ -259,8 +257,6 @@ TEST(SbPosixSocketWaiterWaitTest, RainyDayInvalidWaiter) { WaitShouldNotBlock(kSbSocketWaiterInvalid); } -#endif // SB_API_VERSION >= 16 - } // namespace } // namespace nplb } // namespace starboard diff --git a/starboard/nplb/posix_compliance/posix_socket_waiter_wait_timed_test.cc b/starboard/nplb/posix_compliance/posix_socket_waiter_wait_timed_test.cc index bdad638132a6..21078b686b1f 100644 --- a/starboard/nplb/posix_compliance/posix_socket_waiter_wait_timed_test.cc +++ b/starboard/nplb/posix_compliance/posix_socket_waiter_wait_timed_test.cc @@ -25,8 +25,6 @@ namespace starboard { namespace nplb { namespace { -#if SB_API_VERSION >= 16 - GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SbPosixSocketWaiterWaitTimedTest); struct CallbackValues { @@ -121,8 +119,6 @@ TEST(SbSocketWaiterWaitTimedTest, RainyDayInvalidWaiter) { TimedWaitShouldNotBlock(kSbSocketWaiterInvalid, kSocketTimeout); } -#endif // SB_API_VERSION >= 16 - } // namespace } // namespace nplb } // namespace starboard diff --git a/starboard/nplb/thread_helpers.h b/starboard/nplb/thread_helpers.h deleted file mode 100644 index 5668cae4f49e..000000000000 --- a/starboard/nplb/thread_helpers.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2015 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. - -#ifndef STARBOARD_NPLB_THREAD_HELPERS_H_ -#define STARBOARD_NPLB_THREAD_HELPERS_H_ - -#error This file is deprecated with SB_API_VERSION 16. - -#endif // STARBOARD_NPLB_THREAD_HELPERS_H_ diff --git a/starboard/nplb/time_constants.h b/starboard/nplb/time_constants.h deleted file mode 100644 index a8c828acc1c7..000000000000 --- a/starboard/nplb/time_constants.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2015 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. - -#ifndef STARBOARD_NPLB_TIME_CONSTANTS_H_ -#define STARBOARD_NPLB_TIME_CONSTANTS_H_ - -#error This file is deprecated with SB_API_VERSION 16. - -#endif // STARBOARD_NPLB_TIME_CONSTANTS_H_ diff --git a/starboard/raspi/shared/BUILD.gn b/starboard/raspi/shared/BUILD.gn index 4644c45355ae..6997c48fbb06 100644 --- a/starboard/raspi/shared/BUILD.gn +++ b/starboard/raspi/shared/BUILD.gn @@ -63,7 +63,6 @@ static_library("starboard_platform_sources") { "//starboard/raspi/shared/open_max/video_decoder.cc", "//starboard/raspi/shared/open_max/video_decoder.h", "//starboard/raspi/shared/player_components_factory.cc", - "//starboard/raspi/shared/system_get_device_type.cc", "//starboard/raspi/shared/system_get_property.cc", "//starboard/raspi/shared/system_gles2.cc", "//starboard/raspi/shared/thread_create_priority.cc", diff --git a/starboard/raspi/shared/system_get_device_type.cc b/starboard/raspi/shared/system_get_device_type.cc deleted file mode 100644 index a3e78d207d19..000000000000 --- a/starboard/raspi/shared/system_get_device_type.cc +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2020 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 < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - return kSbSystemDeviceTypeUnknown; -} - -#endif diff --git a/starboard/shared/libevent/socket_waiter_add.cc b/starboard/shared/libevent/socket_waiter_add.cc index d25db10e4292..1155b3a8c962 100644 --- a/starboard/shared/libevent/socket_waiter_add.cc +++ b/starboard/shared/libevent/socket_waiter_add.cc @@ -47,8 +47,6 @@ bool SbSocketWaiterAdd(SbSocketWaiter waiter, return waiter->Add(socket, context, callback, interests, persistent); } -#if SB_API_VERSION >= 16 - bool SbPosixSocketWaiterAdd(SbSocketWaiter waiter, int socket, void* context, @@ -77,4 +75,3 @@ bool SbPosixSocketWaiterAdd(SbSocketWaiter waiter, return waiter->Add(socket, waiter, context, callback, interests, persistent); } -#endif // SB_API_VERSION >= 16 diff --git a/starboard/shared/libevent/socket_waiter_internal.cc b/starboard/shared/libevent/socket_waiter_internal.cc index 4ec469d7358a..1720adc20d1b 100644 --- a/starboard/shared/libevent/socket_waiter_internal.cc +++ b/starboard/shared/libevent/socket_waiter_internal.cc @@ -156,14 +156,12 @@ SbSocketWaiterPrivate::SbSocketWaiterPrivate() } SbSocketWaiterPrivate::~SbSocketWaiterPrivate() { -#if SB_API_VERSION >= 16 i_WaiteesMap::iterator it = i_waitees_.begin(); while (it != i_waitees_.end()) { Waitee* waitee = it->second; ++it; // Increment before removal. Remove(waitee->i_socket, waitee->waiter); } -#endif // SB_API_VERSION >= 16 sb_WaiteesMap::iterator it2 = sb_waitees_.begin(); while (it2 != sb_waitees_.end()) { @@ -184,7 +182,6 @@ SbSocketWaiterPrivate::~SbSocketWaiterPrivate() { #endif } -#if SB_API_VERSION >= 16 bool SbSocketWaiterPrivate::Add(int socket, SbSocketWaiter waiter, void* context, @@ -281,7 +278,6 @@ bool SbSocketWaiterPrivate::CheckSocketRegistered(int socket) { return true; } -#endif // SB_API_VERSION >= 16 bool SbSocketWaiterPrivate::Add(SbSocket socket, void* context, @@ -472,7 +468,6 @@ void SbSocketWaiterPrivate::HandleSignal(Waitee* waitee, // can add another waitee in the callback if we need to. This is also why we // copy all the fields we need out of waitee. if (waitee->use_int_socket == 1) { -#if SB_API_VERSION >= 16 int socket = waitee->i_socket; void* context = waitee->context; SbPosixSocketWaiterCallback callback = waitee->i_callback; @@ -480,7 +475,6 @@ void SbSocketWaiterPrivate::HandleSignal(Waitee* waitee, Remove(waitee->i_socket, waitee->waiter); } callback(this, socket, context, interests); -#endif // SB_API_VERSION >= 16 } else { SbSocket socket = waitee->sb_socket; void* context = waitee->context; diff --git a/starboard/shared/libevent/socket_waiter_internal.h b/starboard/shared/libevent/socket_waiter_internal.h index b2ba3a509234..372698191497 100644 --- a/starboard/shared/libevent/socket_waiter_internal.h +++ b/starboard/shared/libevent/socket_waiter_internal.h @@ -33,7 +33,6 @@ struct SbSocketWaiterPrivate { // These methods implement the SbSocketWaiter API defined in socket_waiter.h. // The Add/Remove pair for integer based socket -#if SB_API_VERSION >= 16 bool Add(int socket, SbSocketWaiter waiter, void* context, @@ -42,7 +41,6 @@ struct SbSocketWaiterPrivate { bool persistent); bool Remove(int socket, SbSocketWaiter waiter); bool CheckSocketRegistered(int socket); -#endif // SB_API_VERSION >= 16 // The Add/Remove pair for SbSocket based socket bool Add(SbSocket socket, @@ -62,7 +60,6 @@ struct SbSocketWaiterPrivate { private: // A registration of a socket with a socket waiter. struct Waitee { -#if SB_API_VERSION >= 16 Waitee(SbSocketWaiter waiter, int socket, void* context, @@ -77,7 +74,6 @@ struct SbSocketWaiterPrivate { persistent(persistent) { use_int_socket = 1; } -#endif // SB_API_VERSION >= 16 Waitee(SbSocketWaiter waiter, SbSocket socket, void* context, @@ -99,9 +95,8 @@ struct SbSocketWaiterPrivate { int use_int_socket; // The callback to call when one or more registered interests become ready. -#if SB_API_VERSION >= 16 SbPosixSocketWaiterCallback i_callback; -#endif // SB_API_VERSION >= 16 + SbSocketWaiterCallback sb_callback; // The waiter this event is registered with. diff --git a/starboard/shared/libevent/socket_waiter_remove.cc b/starboard/shared/libevent/socket_waiter_remove.cc index 7c9f7d0b9e71..8f6fc5d2fbe4 100644 --- a/starboard/shared/libevent/socket_waiter_remove.cc +++ b/starboard/shared/libevent/socket_waiter_remove.cc @@ -23,8 +23,6 @@ bool SbSocketWaiterRemove(SbSocketWaiter waiter, SbSocket socket) { return waiter->Remove(socket, waiter); } -#if SB_API_VERSION >= 16 - bool SbPosixSocketWaiterRemove(SbSocketWaiter waiter, int socket) { if (!SbSocketWaiterIsValid(waiter)) { return false; @@ -32,5 +30,3 @@ bool SbPosixSocketWaiterRemove(SbSocketWaiter waiter, int socket) { return waiter->Remove(socket, waiter); } - -#endif // SB_API_VERSION >= 16 diff --git a/starboard/shared/modular/cobalt_layer_posix_socket_abi_wrappers.cc b/starboard/shared/modular/cobalt_layer_posix_socket_abi_wrappers.cc index fd8d3e1c8ebd..99fbc320154c 100644 --- a/starboard/shared/modular/cobalt_layer_posix_socket_abi_wrappers.cc +++ b/starboard/shared/modular/cobalt_layer_posix_socket_abi_wrappers.cc @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if SB_API_VERSION >= 16 - #include #include @@ -75,5 +73,3 @@ int setsockopt(int socket, } } // extern "C" - -#endif // SB_API_VERSION >= 16 diff --git a/starboard/shared/posix/impl/file_get_path_info.h b/starboard/shared/posix/impl/file_get_path_info.h deleted file mode 100644 index 25968ecb3712..000000000000 --- a/starboard/shared/posix/impl/file_get_path_info.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2017 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. - -// Adapted from base/platform_file_posix.cc - -#ifndef STARBOARD_SHARED_POSIX_IMPL_FILE_GET_PATH_INFO_H_ -#define STARBOARD_SHARED_POSIX_IMPL_FILE_GET_PATH_INFO_H_ - -#error This file is deprecated with SB_API_VERSION 16. - -#endif // STARBOARD_SHARED_POSIX_IMPL_FILE_GET_PATH_INFO_H_ diff --git a/starboard/shared/posix/time_internal.h b/starboard/shared/posix/time_internal.h deleted file mode 100644 index 16221771b32e..000000000000 --- a/starboard/shared/posix/time_internal.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2015 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. - -#ifndef STARBOARD_SHARED_POSIX_TIME_INTERNAL_H_ -#define STARBOARD_SHARED_POSIX_TIME_INTERNAL_H_ - -#error This file is deprecated with SB_API_VERSION 16. - -#endif // STARBOARD_SHARED_POSIX_TIME_INTERNAL_H_ diff --git a/starboard/shared/pthread/thread_local_key_internal.h b/starboard/shared/pthread/thread_local_key_internal.h deleted file mode 100644 index 8a1073eb2ba8..000000000000 --- a/starboard/shared/pthread/thread_local_key_internal.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2015 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. - -#ifndef STARBOARD_SHARED_PTHREAD_THREAD_LOCAL_KEY_INTERNAL_H_ -#define STARBOARD_SHARED_PTHREAD_THREAD_LOCAL_KEY_INTERNAL_H_ - -#error This file is deprecated with SB_API_VERSION 16. - -#endif // STARBOARD_SHARED_PTHREAD_THREAD_LOCAL_KEY_INTERNAL_H_ diff --git a/starboard/shared/starboard/media/media_get_audio_configuration_5_1.cc b/starboard/shared/starboard/media/media_get_audio_configuration_5_1.cc deleted file mode 100644 index 19994b4dc572..000000000000 --- a/starboard/shared/starboard/media/media_get_audio_configuration_5_1.cc +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2017 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. - -// Implementation of SbMediaGetAudioConfiguration for a 5.1 surround sound. - -#include "starboard/media.h" - -#if SB_API_VERSION >= 15 -#error File media_get_audio_configuration_5_1.cc is deprecated, \ - consider using media_get_audio_configuration.cc instead. -#endif // SB_API_VERSION >= 15 - -bool SbMediaGetAudioConfiguration( - int output_index, - SbMediaAudioConfiguration* out_configuration) { - if (output_index != 0 || out_configuration == NULL) { - return false; - } - - *out_configuration = {}; - - out_configuration->index = 0; - out_configuration->connector = kSbMediaAudioConnectorNone; - out_configuration->latency = 0; - out_configuration->coding_type = kSbMediaAudioCodingTypePcm; - // There are 6 channels in 5.1 surround sound. - out_configuration->number_of_channels = 6; - return true; -} diff --git a/starboard/shared/starboard/media/media_get_audio_configuration_stereo_only.cc b/starboard/shared/starboard/media/media_get_audio_configuration_stereo_only.cc deleted file mode 100644 index d6f71c0eebb2..000000000000 --- a/starboard/shared/starboard/media/media_get_audio_configuration_stereo_only.cc +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2017 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. - -// Implementation of SbMediaGetAudioConfiguration for a single stereo output. - -#include "starboard/media.h" - -#if SB_API_VERSION >= 15 -#error File media_get_audio_configuration_stereo_only.cc is deprecated, \ - consider using media_get_audio_configuration.cc instead. -#endif // SB_API_VERSION >= 15 - -bool SbMediaGetAudioConfiguration( - int output_index, - SbMediaAudioConfiguration* out_configuration) { - if (output_index != 0 || out_configuration == NULL) { - return false; - } - - *out_configuration = {}; - - out_configuration->index = 0; - out_configuration->connector = kSbMediaAudioConnectorNone; - out_configuration->latency = 0; - out_configuration->coding_type = kSbMediaAudioCodingTypePcm; - out_configuration->number_of_channels = 2; - return true; -} diff --git a/starboard/shared/stub/system_get_device_type.cc b/starboard/shared/stub/system_get_device_type.cc deleted file mode 100644 index 00ac8d3194a6..000000000000 --- a/starboard/shared/stub/system_get_device_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 < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - return kSbSystemDeviceTypeUnknown; -} - -#endif diff --git a/starboard/shared/uwp/system_get_device_type.cc b/starboard/shared/uwp/system_get_device_type.cc deleted file mode 100644 index e1b941b08e16..000000000000 --- a/starboard/shared/uwp/system_get_device_type.cc +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2017 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" - -#include - -#include "starboard/common/log.h" -#include "starboard/shared/win32/wchar_utils.h" - -using Windows::System::Profile::AnalyticsInfo; -using Windows::System::Profile::AnalyticsVersionInfo; - -#if SB_API_VERSION < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - AnalyticsVersionInfo ^ version_info = AnalyticsInfo::VersionInfo; - std::string family = starboard::shared::win32::platformStringToString( - version_info->DeviceFamily); - - if (family.compare("Windows.Desktop") == 0) { - return kSbSystemDeviceTypeDesktopPC; - } - if (family.compare("Windows.Xbox") == 0) { - return kSbSystemDeviceTypeGameConsole; - } - SB_NOTREACHED(); - return kSbSystemDeviceTypeUnknown; -} - -#endif diff --git a/starboard/shared/win32/system_get_device_type.cc b/starboard/shared/win32/system_get_device_type.cc deleted file mode 100644 index 5e5a4647c717..000000000000 --- a/starboard/shared/win32/system_get_device_type.cc +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2017 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" - -#include - -#include "starboard/common/log.h" -#include "starboard/shared/win32/wchar_utils.h" - -#if SB_API_VERSION < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - return kSbSystemDeviceTypeDesktopPC; -} - -#endif diff --git a/starboard/stub/BUILD.gn b/starboard/stub/BUILD.gn index f4d16a1b858d..abfc82733012 100644 --- a/starboard/stub/BUILD.gn +++ b/starboard/stub/BUILD.gn @@ -150,7 +150,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_device_type.cc", "//starboard/shared/stub/system_get_error_string.cc", "//starboard/shared/stub/system_get_last_error.cc", "//starboard/shared/stub/system_get_locale_id.cc", diff --git a/third_party/musl/src/include/errno.h b/third_party/musl/src/include/errno.h deleted file mode 100644 index c1f68fa18506..000000000000 --- a/third_party/musl/src/include/errno.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef ERRNO_H -#define ERRNO_H - -#include "../../include/errno.h" - -// Prior to SB 16, ___errno_location was a weak alias for __errno_location in musl. -// Starting with SB 16, we no longer implement __errno_location in musl. Instead, we retrieve the __errno_location symbols from the system. -#if SB_API_VERSION < 16 -#ifdef __GNUC__ -__attribute__((const)) -#endif -hidden int *___errno_location(void); - -#undef errno -#define errno (*___errno_location()) -#endif // SB_API_VERSION < 16 - -#endif \ No newline at end of file