From 79404e4d411bd9287548f36cbdfdd9e1c14be47d Mon Sep 17 00:00:00 2001
From: Cory McWilliams <cory@unprompted.com>
Date: Wed, 23 Aug 2023 21:37:23 +0000
Subject: [PATCH] Set android min sdk version and api version all to 28. 
 That's all we need.  Should fix reported crashes.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4418 ed5197a5-7fde-0310-b194-c3ffbd925b24
---
 Makefile                        | 9 ++++-----
 src/android/AndroidManifest.xml | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 82f9bb09..07b04187 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,7 @@ ANDROID_SDK ?= ~/Android/Sdk
 ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/33.0.1
 ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-33
 ANDROID_NDK ?= $(ANDROID_SDK)/ndk/23.1.7779620
-ANDROID_NDK_API_VERSION := 31
-ANDROID_MIN_SDK_VERSION := 26
+ANDROID_MIN_SDK_VERSION := 28
 
 ANDROID_ARM64_TARGETS := \
 	out/androiddebug/tildefriends \
@@ -82,10 +81,10 @@ windebug winrelease: LDFLAGS += \
 	-Ldeps/openssl/mingw64/lib
 $(ANDROID_X86_64_TARGETS): ANDROID_NDK_TARGET_TRIPLE := x86_64-linux-android
 $(ANDROID_ARM64_TARGETS): ANDROID_NDK_TARGET_TRIPLE := aarch64-linux-android
-$(ANDROID_TARGETS): CC = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/$(ANDROID_NDK_TARGET_TRIPLE)$(ANDROID_NDK_API_VERSION)-clang
+$(ANDROID_TARGETS): CC = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/$(ANDROID_NDK_TARGET_TRIPLE)$(ANDROID_MIN_SDK_VERSION)-clang
 $(ANDROID_TARGETS): AS = $(CC)
 $(ANDROID_TARGETS): CFLAGS += \
-	-target $(ANDROID_NDK_TARGET_TRIPLE)$(ANDROID_NDK_API_VERSION) \
+	-target $(ANDROID_NDK_TARGET_TRIPLE)$(ANDROID_MIN_SDK_VERSION) \
 	-Wno-unknown-warning-option
 $(ANDROID_ARM64_TARGETS): CFLAGS += -Ideps/openssl/android/arm64-v8a/usr/local/include
 $(ANDROID_ARM64_TARGETS): LDFLAGS += -Ldeps/openssl/android/arm64-v8a/usr/local/lib
@@ -392,7 +391,7 @@ windebug winrelease: LDFLAGS += \
 	-lws2_32 \
 	-lwsock32
 $(ANDROID_TARGETS): LDFLAGS += \
-	-target $(ANDROID_NDK_TARGET_TRIPLE)$(ANDROID_NDK_API_VERSION) \
+	-target $(ANDROID_NDK_TARGET_TRIPLE)$(ANDROID_MIN_SDK_VERSION) \
 	-ldl \
 	-llog \
 	-lssl \
diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml
index fddf0344..d6cff06c 100644
--- a/src/android/AndroidManifest.xml
+++ b/src/android/AndroidManifest.xml
@@ -3,7 +3,7 @@
 	package="com.unprompted.tildefriends"
 	versionCode="10"
 	versionName="0.0.10-wip">
-	<uses-sdk android:minSdkVersion="26"/>
+	<uses-sdk android:minSdkVersion="28"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application android:label="Tilde Friends" android:usesCleartextTraffic="true" android:debuggable="true">
 		<meta-data android:name="android.max_aspect" android:value="2.1"/>