GNUmakefile

@@ -3,7 +3,7 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_CODE := 23
+VERSION_CODE := 22
 VERSION_NUMBER := 0.0.21-wip
 VERSION_NAME := Psst.  Look behind you.
 
@@ -63,11 +63,7 @@ ANDROID_MIN_SDK_VERSION := 24
 ANDROID_TARGET_SDK_VERSION := 34
 ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0
 ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-$(ANDROID_TARGET_SDK_VERSION)
-ifneq "$(wildcard $(ANDROID_SDK)/ndk/27.0.12077973/.)" ""
-ANDROID_NDK ?= $(ANDROID_SDK)/ndk/27.0.12077973
-else
 ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.2.11394342
-endif
 
 ANDROID_ARMV7A_TARGETS := \
 	out/androiddebug-armv7a/tildefriends \
@@ -918,7 +914,7 @@ fetchdeps:
 
 ANDROID_DEPS := deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a
 $(ANDROID_DEPS):
-	+@ANDROID_NDK_ROOT=$(ANDROID_NDK) tools/ssl-android
+	+@tools/ssl-android
 $(filter $(BUILD_DIR)/android%,$(APP_OBJS)): | $(ANDROID_DEPS)
 
 ifeq ($(HAVE_WIN),1)

src/android/AndroidManifest.xml

@@ -1,7 +1,9 @@
 <?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"

src/main.c

@@ -794,7 +794,6 @@ 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;
@@ -819,7 +818,6 @@ 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;
@@ -861,8 +859,21 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
 
 int main(int argc, char* argv[])
 {
-	tf_printf("Welcome to Tilde Friends.  This is not the way to run on Android.\n");
+	_startup(argc, argv);
-	return EXIT_FAILURE;
+	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;
 }
 #elif TARGET_OS_IPHONE
 void tf_run_thread_start(const char* zip_path)