Compare commits

...

2 Commits

Author SHA1 Message Date
9f71ec6194 Minor android cleanup.
All checks were successful
Build Tilde Friends / Build-All (push) Successful in 6m12s
2024-07-24 11:27:37 -04:00
bb36afc390 Use android ndk r27 (LTS) if available. 2024-07-24 11:20:35 -04:00
3 changed files with 10 additions and 19 deletions

View File

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

View File

@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.unprompted.tildefriends" package="com.unprompted.tildefriends"
android:versionCode="22"
android:versionName="0.0.21-wip"> android:versionName="0.0.21-wip">
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="34"/>
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<application <application
android:label="Tilde Friends" android:label="Tilde Friends"

View File

@ -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, apk_path, apk);
(*env)->ReleaseStringUTFChars(env, out_port_file_path, out_port_file); (*env)->ReleaseStringUTFChars(env, out_port_file_path, out_port_file);
tf_mem_shutdown();
tf_printf("tf_server_main finished with %d.", result); tf_printf("tf_server_main finished with %d.", result);
s_jni_env = NULL; 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); int result = _tf_command_sandbox(NULL, _countof(args), (char**)args);
tf_mem_shutdown();
tf_printf("tf_sandbox_main finished with %d.", result); tf_printf("tf_sandbox_main finished with %d.", result);
s_jni_env = NULL; s_jni_env = NULL;
@ -859,21 +861,8 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
_startup(argc, argv); tf_printf("Welcome to Tilde Friends. This is not the way to run on Android.\n");
int result = -1; return EXIT_FAILURE;
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 #elif TARGET_OS_IPHONE
void tf_run_thread_start(const char* zip_path) void tf_run_thread_start(const char* zip_path)