Upgrade min_sdk_version to 24 to only support Android 7+ (#1055)

Co-authored-by: Colin Liang <[email protected]> (cherry picked from commit 92e6484)
youtube · Jul 31, 2023 · ec36f54 · ec36f54
1 parent e0aa92b
commit ec36f54
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 22 deletions.
diff --git a/base/android/jni_generator/AndroidManifest.xml b/base/android/jni_generator/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.jni.generator">
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
+    <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="33" />
     <application></application>
 
 </manifest>
diff --git a/build/android/gradle/android.jinja b/build/android/gradle/android.jinja
@@ -51,7 +51,7 @@ android {
 
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion {{ target_sdk_version }}
     }
 

diff --git a/build/config/android/config.gni b/build/config/android/config.gni
@@ -48,7 +48,7 @@ if (is_android || is_chromeos) {
 
     # The default to use for android:minSdkVersion for targets that do
     # not explicitly set it.
-    default_min_sdk_version = 21
+    default_min_sdk_version = 24
 
     # [WIP] Allows devs to achieve much faster edit-build-install cycles.
     # Currently only works for ChromeModern apks due to incremental install.
@@ -62,8 +62,8 @@ if (is_android || is_chromeos) {
     android32_ndk_api_level = default_min_sdk_version
 
     # Android API level for 64 bits platforms
-    if (default_min_sdk_version < 21) {
-      android64_ndk_api_level = 21
+    if (default_min_sdk_version < 24) {
+      android64_ndk_api_level = 24
     } else {
       android64_ndk_api_level = default_min_sdk_version
     }
@@ -81,8 +81,8 @@ if (is_android || is_chromeos) {
 
   if (!defined(default_android_ndk_root)) {
     default_android_ndk_root = "//third_party/android_ndk"
-    default_android_ndk_version = "r22"
-    default_android_ndk_major_version = 22
+    default_android_ndk_version = "r25"
+    default_android_ndk_major_version = 25
   } else {
     assert(defined(default_android_ndk_version))
     assert(defined(default_android_ndk_major_version))

diff --git a/net/android/unittest_support/AndroidManifest.xml b/net/android/unittest_support/AndroidManifest.xml
@@ -10,7 +10,7 @@ found in the LICENSE file.
       android:versionCode="1"
       android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+    <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="33" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>

diff --git a/net/test/android/javatests/AndroidManifest.xml b/net/test/android/javatests/AndroidManifest.xml
@@ -8,7 +8,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.chromium.net.test.support">
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+    <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="33" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 

diff --git a/starboard/android/shared/toolchain/toolchain.gni b/starboard/android/shared/toolchain/toolchain.gni
@@ -18,7 +18,7 @@ declare_args() {
   android_sdk_path = getenv("ANDROID_HOME")
   android_ndk_path = ""
   sb_android_ndk_version = "25.2.9519653"
-  android_ndk_api_level = 21
+  android_ndk_api_level = 24
 }
 
 if (android_sdk_path == "") {

diff --git a/starboard/shared/posix/system_get_error_string.cc b/starboard/shared/posix/system_get_error_string.cc
@@ -12,22 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "starboard/system.h"
-
-#include <iostream>
-
 #include <errno.h>
 #include <string.h>
 
+#include <iostream>
+
 #include "starboard/common/string.h"
 #include "starboard/configuration.h"
+#include "starboard/system.h"
 
 int SbSystemGetErrorString(SbSystemError error,
                            char* out_string,
                            int string_length) {
   char buffer[256];
 
-#if defined(__GLIBC__)
+#if defined(__GLIBC__) || defined(_GNU_SOURCE)
   char* result = strerror_r(error, buffer, SB_ARRAY_SIZE(buffer));
 #else
   char* result = buffer;

diff --git a/testing/android/AndroidManifest.xml b/testing/android/AndroidManifest.xml
@@ -10,7 +10,7 @@ found in the LICENSE file.
       android:versionCode="1"
       android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="L" android:targetSdkVersion="L" />
+    <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="33" />
 
     <application android:label="ChromeNativeTests">
         <activity android:name=".ChromeNativeTestActivity"

diff --git a/third_party/skia/platform_tools/android/apps/skottie/build.gradle b/third_party/skia/platform_tools/android/apps/skottie/build.gradle
@@ -20,8 +20,8 @@ android {
     flavorDimensions "tier"
     defaultConfig {
         applicationId "org.skia.skottie"
-        minSdkVersion 23
-        targetSdkVersion 23
+        minSdkVersion 24
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         signingConfig signingConfigs.debug

diff --git a/third_party/skia/platform_tools/android/apps/skqp/build.gradle b/third_party/skia/platform_tools/android/apps/skqp/build.gradle
@@ -15,8 +15,8 @@ android {
     compileSdkVersion 26
     defaultConfig {
         applicationId "org.skia.skqp"
-        minSdkVersion 19
-        targetSdkVersion 19
+        minSdkVersion 24
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         signingConfig signingConfigs.debug

diff --git a/third_party/skia/platform_tools/android/apps/viewer/build.gradle b/third_party/skia/platform_tools/android/apps/viewer/build.gradle
@@ -16,8 +16,8 @@ android {
     buildToolsVersion "22.0.1"
     defaultConfig {
         applicationId "org.skia.viewer"
-        minSdkVersion 19
-        targetSdkVersion 19
+        minSdkVersion 24
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         signingConfig signingConfigs.debug