cory/tildefriends
4
5
Fork 1
Code Issues 29 Pull Requests 1 Actions Releases 26 Wiki Activity

Minor android cleanup.
All checks were successful
Build Tilde Friends / Build-All (push) Successful in 6m12s
Details

Browse Source
This commit is contained in:
Cory McWilliams 2024-07-24 11:27:37 -04:00
parent bb36afc390
commit 9f71ec6194
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
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.

2
src/android/AndroidManifest.xml
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"

19
src/main.c
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)