From c76291a54dae0222109ecae00429a51f3a144db7 Mon Sep 17 00:00:00 2001
From: Madhura Jayaraman <madjay@google.com>
Date: Wed, 11 Sep 2024 12:35:48 -0700
Subject: [PATCH] Remove SB_API_VERSION < 17 checks for starboard/stub

Change-Id: Ic61c423774b569ea78db2fdecafdda0275064a14
---
 starboard/android/shared/android_main.cc  | 2 --
 starboard/stub/application_stub.cc        | 4 ----
 starboard/stub/application_stub.h         | 4 ----
 starboard/stub/configuration_constants.cc | 2 --
 starboard/stub/main.cc                    | 7 -------
 5 files changed, 19 deletions(-)

diff --git a/starboard/android/shared/android_main.cc b/starboard/android/shared/android_main.cc
index bdd55763e334..9be94de99c46 100644
--- a/starboard/android/shared/android_main.cc
+++ b/starboard/android/shared/android_main.cc
@@ -387,7 +387,6 @@ Java_dev_cobalt_coat_VolumeStateReceiver_nativeMuteChanged(JNIEnv* env,
 
 }  // namespace
 
-#if SB_API_VERSION >= 15
 extern "C" int SbRunStarboardMain(int argc,
                                   char** argv,
                                   SbEventHandleCallback callback) {
@@ -419,7 +418,6 @@ extern "C" int SbRunStarboardMain(int argc,
 
   return error_level;
 }
-#endif  // SB_API_VERSION >= 15
 
 }  // namespace shared
 }  // namespace android
diff --git a/starboard/stub/application_stub.cc b/starboard/stub/application_stub.cc
index 7aeb224b092c..5d48238a38b7 100644
--- a/starboard/stub/application_stub.cc
+++ b/starboard/stub/application_stub.cc
@@ -20,12 +20,8 @@
 namespace starboard {
 namespace stub {
 
-#if SB_API_VERSION >= 15
 ApplicationStub::ApplicationStub(SbEventHandleCallback sb_event_handle_callback)
     : QueueApplication(sb_event_handle_callback) {}
-#else
-ApplicationStub::ApplicationStub() {}
-#endif  // SB_API_VERSION >= 15
 
 ApplicationStub::~ApplicationStub() {}
 
diff --git a/starboard/stub/application_stub.h b/starboard/stub/application_stub.h
index 72a8cd2ade70..b2aeb84d23e4 100644
--- a/starboard/stub/application_stub.h
+++ b/starboard/stub/application_stub.h
@@ -27,11 +27,7 @@ namespace stub {
 // Stub application engine using the generic queue and a stub implementation.
 class ApplicationStub : public shared::starboard::QueueApplication {
  public:
-#if SB_API_VERSION >= 15
   explicit ApplicationStub(SbEventHandleCallback sb_event_handle_callback);
-#else
-  ApplicationStub();
-#endif  // SB_API_VERSION >= 15
 
   ~ApplicationStub() override;
 
diff --git a/starboard/stub/configuration_constants.cc b/starboard/stub/configuration_constants.cc
index 1f70040994ef..f3315f36c896 100644
--- a/starboard/stub/configuration_constants.cc
+++ b/starboard/stub/configuration_constants.cc
@@ -124,11 +124,9 @@ const int kSbPreferredRgbaByteOrder = SB_PREFERRED_RGBA_BYTE_ORDER_RGBA;
 // The maximum size the cache directory is allowed to use in bytes.
 const uint32_t kSbMaxSystemPathCacheDirectorySize = 24 << 20;  // 24MiB
 
-#if SB_API_VERSION >= 16
 // Whether this platform can map executable memory. This is required for
 // platforms that want to JIT.
 SB_EXPORT extern const bool kSbCanMapExecutableMemory = false;
 
 // Platform can support partial audio frames
 SB_EXPORT extern const bool kHasPartialAudioFramesSupport = false;
-#endif
diff --git a/starboard/stub/main.cc b/starboard/stub/main.cc
index 48d568d4c318..8bcb60f82171 100644
--- a/starboard/stub/main.cc
+++ b/starboard/stub/main.cc
@@ -16,17 +16,10 @@
 #include "starboard/stub/application_stub.h"
 
 int main(int argc, char** argv) {
-#if SB_API_VERSION >= 15
   return SbRunStarboardMain(argc, argv, SbEventHandle);
-#else
-  starboard::stub::ApplicationStub application;
-  return application.Run(argc, argv);
-#endif  // SB_API_VERSION >= 15
 }
 
-#if SB_API_VERSION >= 15
 int SbRunStarboardMain(int argc, char** argv, SbEventHandleCallback callback) {
   starboard::stub::ApplicationStub application(callback);
   return application.Run(argc, argv);
 }
-#endif  // SB_API_VERSION >= 15