From 485e9a0ba1fc4688b1cccca55b3c0af628675b07 Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Tue, 15 Jun 2021 02:11:38 +0000
Subject: [PATCH] adjust android min SDK to 19 and remove test sources from SDL lib
---
source/Android.mk | 3 +--
source/build-scripts/androidbuildlibs.sh | 2 +-
source/android-project/app/jni/Application.mk | 2 +-
source/android-project/app/build.gradle | 8 ++++----
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/source/Android.mk b/source/Android.mk
index 0d29167..58dcd53 100644
--- a/source/Android.mk
+++ b/source/Android.mk
@@ -53,8 +53,7 @@
$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
$(wildcard $(LOCAL_PATH)/src/video/*.c) \
$(wildcard $(LOCAL_PATH)/src/video/android/*.c) \
- $(wildcard $(LOCAL_PATH)/src/video/yuv2rgb/*.c) \
- $(wildcard $(LOCAL_PATH)/src/test/*.c))
+ $(wildcard $(LOCAL_PATH)/src/video/yuv2rgb/*.c))
LOCAL_SHARED_LIBRARIES := hidapi
diff --git a/source/android-project/app/build.gradle b/source/android-project/app/build.gradle
index bf3c35d..3e780c3 100644
--- a/source/android-project/app/build.gradle
+++ b/source/android-project/app/build.gradle
@@ -8,18 +8,18 @@
}
android {
- compileSdkVersion 26
+ compileSdkVersion 30
defaultConfig {
if (buildAsApplication) {
applicationId "org.libsdl.app"
}
- minSdkVersion 16
- targetSdkVersion 26
+ minSdkVersion 19
+ targetSdkVersion 30
versionCode 1
versionName "1.0"
externalNativeBuild {
ndkBuild {
- arguments "APP_PLATFORM=android-16"
+ arguments "APP_PLATFORM=android-19"
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}
// cmake {
diff --git a/source/android-project/app/jni/Application.mk b/source/android-project/app/jni/Application.mk
index 023bc20..12bad51 100644
--- a/source/android-project/app/jni/Application.mk
+++ b/source/android-project/app/jni/Application.mk
@@ -7,4 +7,4 @@
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
# Min runtime API level
-APP_PLATFORM=android-16
+APP_PLATFORM=android-19
diff --git a/source/build-scripts/androidbuildlibs.sh b/source/build-scripts/androidbuildlibs.sh
index 3e57b47..3d33063 100755
--- a/source/build-scripts/androidbuildlibs.sh
+++ b/source/build-scripts/androidbuildlibs.sh
@@ -69,6 +69,6 @@
NDK_LIBS_OUT=$lib \
APP_BUILD_SCRIPT=Android.mk \
APP_ABI="armeabi-v7a arm64-v8a x86 x86_64" \
- APP_PLATFORM=android-16 \
+ APP_PLATFORM=android-19 \
APP_MODULES="SDL2 SDL2_main" \
$ndk_args
--
Gitblit v1.9.3