From 82aa355904afb95c0489be6993e4b2e2faeb7dc0 Mon Sep 17 00:00:00 2001
From: Changming Sun <chasun@microsoft.com>
Date: Thu, 16 Jan 2025 08:03:31 -0800
Subject: [PATCH] Update android_min_sdk_version/android_target_sdk_version
 (#23369)

Update android_min_sdk_version to 24 and android_target_sdk_version to
34.
Previously Jian already updated the values for some pipelines. This PR
updates the other occurrences to make things consistent

Why android_min_sdk_version is set to 24:
Because React Native requires so:

https://github.com/react-native-community/discussions-and-proposals/discussions/802

Why android_target_sdk_version is set to 34:
Because according to Google Play's policy, new apps and app updates must
target Android 14 (API level 34) to be submitted to Google Play.

https://support.google.com/googleplay/android-developer/answer/11926878?hl=en
---
 js/react_native/android/gradle.properties                   | 6 +++---
 js/react_native/e2e/android/build.gradle                    | 6 +++---
 .../github/android/default_qnn_aar_build_settings.json      | 4 ++--
 .../github/android/training_full_aar_build_settings.json    | 4 ++--
 .../github/js/react_native_e2e_full_aar_build_settings.json | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/js/react_native/android/gradle.properties b/js/react_native/android/gradle.properties
index 8fe6e40d76..21fbbef09f 100644
--- a/js/react_native/android/gradle.properties
+++ b/js/react_native/android/gradle.properties
@@ -14,6 +14,6 @@ org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
 android.enableJetifier=true
 android.useAndroidX=true
 OnnxruntimeModule_buildToolsVersion=29.0.2
-OnnxruntimeModule_compileSdkVersion=31
-OnnxruntimeModule_minSdkVersion=21
-OnnxruntimeModule_targetSdkVersion=31
+OnnxruntimeModule_compileSdkVersion=34
+OnnxruntimeModule_minSdkVersion=24
+OnnxruntimeModule_targetSdkVersion=34
diff --git a/js/react_native/e2e/android/build.gradle b/js/react_native/e2e/android/build.gradle
index e8563ed542..9b953c0849 100644
--- a/js/react_native/e2e/android/build.gradle
+++ b/js/react_native/e2e/android/build.gradle
@@ -3,9 +3,9 @@
 buildscript {
     ext {
         buildToolsVersion = "29.0.2"
-        minSdkVersion = 21
-        compileSdkVersion = 31
-        targetSdkVersion = 31
+        minSdkVersion = 24
+        compileSdkVersion = 34
+        targetSdkVersion = 34
         kotlinVersion = "1.5.30"
     }
     repositories {
diff --git a/tools/ci_build/github/android/default_qnn_aar_build_settings.json b/tools/ci_build/github/android/default_qnn_aar_build_settings.json
index 599c108f83..8c36244035 100644
--- a/tools/ci_build/github/android/default_qnn_aar_build_settings.json
+++ b/tools/ci_build/github/android/default_qnn_aar_build_settings.json
@@ -2,8 +2,8 @@
     "build_abis": [
         "arm64-v8a"
     ],
-    "android_min_sdk_version": 21,
-    "android_target_sdk_version": 24,
+    "android_min_sdk_version": 24,
+    "android_target_sdk_version": 34,
     "build_params": [
         "--enable_lto",
         "--android",
diff --git a/tools/ci_build/github/android/training_full_aar_build_settings.json b/tools/ci_build/github/android/training_full_aar_build_settings.json
index 013804e2d6..7354bc774a 100644
--- a/tools/ci_build/github/android/training_full_aar_build_settings.json
+++ b/tools/ci_build/github/android/training_full_aar_build_settings.json
@@ -5,8 +5,8 @@
         "x86",
         "x86_64"
     ],
-    "android_min_sdk_version": 21,
-    "android_target_sdk_version": 24,
+    "android_min_sdk_version": 24,
+    "android_target_sdk_version": 34,
     "build_params": [
         "--enable_lto",
         "--android",
diff --git a/tools/ci_build/github/js/react_native_e2e_full_aar_build_settings.json b/tools/ci_build/github/js/react_native_e2e_full_aar_build_settings.json
index 3e755ab5aa..c93c65f533 100644
--- a/tools/ci_build/github/js/react_native_e2e_full_aar_build_settings.json
+++ b/tools/ci_build/github/js/react_native_e2e_full_aar_build_settings.json
@@ -2,8 +2,8 @@
     "build_abis": [
         "x86_64"
     ],
-    "android_min_sdk_version": 21,
-    "android_target_sdk_version": 24,
+    "android_min_sdk_version": 24,
+    "android_target_sdk_version": 34,
     "build_params": [
         "--android",
         "--parallel",