From 9f71ec61941ea4c6042334b848dd07e0fc04f44c Mon Sep 17 00:00:00 2001
From: Cory McWilliams <cory@unprompted.com>
Date: Wed, 24 Jul 2024 11:27:37 -0400
Subject: [PATCH] Minor android cleanup.

---
 GNUmakefile                     |  2 +-
 src/android/AndroidManifest.xml |  2 --
 src/main.c                      | 19 ++++---------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index d6c0ef47..07234cf3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,7 +3,7 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_CODE := 22
+VERSION_CODE := 23
 VERSION_NUMBER := 0.0.21-wip
 VERSION_NAME := Psst.  Look behind you.
 
diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml
index d6693e56..7214692a 100644
--- a/src/android/AndroidManifest.xml
+++ b/src/android/AndroidManifest.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.unprompted.tildefriends"
-	android:versionCode="22"
 	android:versionName="0.0.21-wip">
-	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="34"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application
 		android:label="Tilde Friends"
diff --git a/src/main.c b/src/main.c
index 68652498..96f80d64 100644
--- a/src/main.c
+++ b/src/main.c
@@ -794,6 +794,7 @@ static jint _tf_server_main(JNIEnv* env, jobject this_object, jstring files_dir,
 	(*env)->ReleaseStringUTFChars(env, apk_path, apk);
 	(*env)->ReleaseStringUTFChars(env, out_port_file_path, out_port_file);
 
+	tf_mem_shutdown();
 	tf_printf("tf_server_main finished with %d.", result);
 
 	s_jni_env = NULL;
@@ -818,6 +819,7 @@ static jint _tf_sandbox_main(JNIEnv* env, jobject this_object, int pipe_fd)
 
 	int result = _tf_command_sandbox(NULL, _countof(args), (char**)args);
 
+	tf_mem_shutdown();
 	tf_printf("tf_sandbox_main finished with %d.", result);
 
 	s_jni_env = NULL;
@@ -859,21 +861,8 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
 
 int main(int argc, char* argv[])
 {
-	_startup(argc, argv);
-	int result = -1;
-	if (argc > 1)
-	{
-		if (strcmp(argv[1], "run") == 0)
-		{
-			result = _tf_command_run(argv[0], argc - 1, argv + 1);
-		}
-		else if (strcmp(argv[1], "sandbox") == 0)
-		{
-			result = _tf_command_sandbox(argv[0], argc - 1, argv + 1);
-		}
-	}
-	tf_mem_shutdown();
-	return result;
+	tf_printf("Welcome to Tilde Friends.  This is not the way to run on Android.\n");
+	return EXIT_FAILURE;
 }
 #elif TARGET_OS_IPHONE
 void tf_run_thread_start(const char* zip_path)