From 9b42892ffee312f4cd5ea7e61ee9ccd4428a4fa3 Mon Sep 17 00:00:00 2001 From: Yavor Goulishev Date: Wed, 4 Nov 2020 18:29:12 -0800 Subject: [PATCH] Set the default starboard API to 12. Change-Id: If7ead5ce08915e223bb9b78fad8b911ae47bc256 --- starboard/android/shared/configuration_public.h | 6 ------ starboard/linux/x64x11/configuration_public.h | 6 ------ starboard/linux/x64x11/skia/configuration_public.h | 8 -------- starboard/raspi/shared/configuration_public.h | 6 ------ starboard/sabi/sabi.py | 2 +- starboard/stub/configuration_public.h | 6 ------ 6 files changed, 1 insertion(+), 33 deletions(-) diff --git a/starboard/android/shared/configuration_public.h b/starboard/android/shared/configuration_public.h index 371a4133013f..2064399c34cf 100644 --- a/starboard/android/shared/configuration_public.h +++ b/starboard/android/shared/configuration_public.h @@ -23,12 +23,6 @@ #ifndef STARBOARD_ANDROID_SHARED_CONFIGURATION_PUBLIC_H_ #define STARBOARD_ANDROID_SHARED_CONFIGURATION_PUBLIC_H_ -#if SB_API_VERSION != SB_EXPERIMENTAL_API_VERSION -#error \ - "This platform's sabi.json file is expected to track the experimental " \ -"Starboard API version." -#endif // SB_API_VERSION != SB_EXPERIMENTAL_API_VERSION - // --- Architecture Configuration -------------------------------------------- // Indicates that there is no support for alignment at greater than 16 bytes for diff --git a/starboard/linux/x64x11/configuration_public.h b/starboard/linux/x64x11/configuration_public.h index 38bcc2e79e26..1fa30982d279 100644 --- a/starboard/linux/x64x11/configuration_public.h +++ b/starboard/linux/x64x11/configuration_public.h @@ -22,12 +22,6 @@ #ifndef STARBOARD_LINUX_X64X11_CONFIGURATION_PUBLIC_H_ #define STARBOARD_LINUX_X64X11_CONFIGURATION_PUBLIC_H_ -#if SB_API_VERSION != SB_EXPERIMENTAL_API_VERSION -#error \ - "This platform's sabi.json file is expected to track the experimental " \ -"Starboard API version." -#endif // SB_API_VERSION != SB_EXPERIMENTAL_API_VERSION - // --- Architecture Configuration -------------------------------------------- // Configuration parameters that allow the application to make some general diff --git a/starboard/linux/x64x11/skia/configuration_public.h b/starboard/linux/x64x11/skia/configuration_public.h index 8879563b05e1..ed69d67abcf2 100644 --- a/starboard/linux/x64x11/skia/configuration_public.h +++ b/starboard/linux/x64x11/skia/configuration_public.h @@ -18,14 +18,6 @@ #ifndef STARBOARD_LINUX_X64X11_SKIA_CONFIGURATION_PUBLIC_H_ #define STARBOARD_LINUX_X64X11_SKIA_CONFIGURATION_PUBLIC_H_ -// This is not a released configuration, so it should implement the -// experimental API version to validate trunk's viability. -#if SB_API_VERSION != SB_EXPERIMENTAL_API_VERSION -#error \ - "This platform's sabi.json file is expected to track the experimental " \ -"Starboard API version." -#endif // SB_API_VERSION != SB_EXPERIMENTAL_API_VERSION - // Include the X64X11 Linux configuration. #include "starboard/linux/x64x11/configuration_public.h" diff --git a/starboard/raspi/shared/configuration_public.h b/starboard/raspi/shared/configuration_public.h index 05988f6109ba..34787251b686 100644 --- a/starboard/raspi/shared/configuration_public.h +++ b/starboard/raspi/shared/configuration_public.h @@ -17,12 +17,6 @@ #ifndef STARBOARD_RASPI_SHARED_CONFIGURATION_PUBLIC_H_ #define STARBOARD_RASPI_SHARED_CONFIGURATION_PUBLIC_H_ -#if SB_API_VERSION != SB_EXPERIMENTAL_API_VERSION -#error \ - "This platform's sabi.json file is expected to track the experimental " \ -"Starboard API version." -#endif // SB_API_VERSION != SB_EXPERIMENTAL_API_VERSION - // --- Architecture Configuration -------------------------------------------- // --- System Header Configuration ------------------------------------------- diff --git a/starboard/sabi/sabi.py b/starboard/sabi/sabi.py index 09d04a3ebc00..3d9516636f72 100644 --- a/starboard/sabi/sabi.py +++ b/starboard/sabi/sabi.py @@ -13,4 +13,4 @@ # limitations under the License. """Source of truth of the default/experimental Starboard API version.""" -SB_API_VERSION = 13 +SB_API_VERSION = 12 diff --git a/starboard/stub/configuration_public.h b/starboard/stub/configuration_public.h index f27313c8558a..cc64e9d5b15a 100644 --- a/starboard/stub/configuration_public.h +++ b/starboard/stub/configuration_public.h @@ -22,12 +22,6 @@ #ifndef STARBOARD_STUB_CONFIGURATION_PUBLIC_H_ #define STARBOARD_STUB_CONFIGURATION_PUBLIC_H_ -#if SB_API_VERSION != SB_EXPERIMENTAL_API_VERSION -#error \ - "This platform's sabi.json file is expected to track the experimental " \ -"Starboard API version." -#endif // SB_API_VERSION != SB_EXPERIMENTAL_API_VERSION - // --- Architecture Configuration -------------------------------------------- // Some platforms will not align variables on the stack with an alignment