diff --git a/Makefile b/Makefile index a8026430..be2810b6 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,8 @@ CFLAGS += \ ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0 ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-33 ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.0.10792818 -ANDROID_MIN_SDK_VERSION := 26 +ANDROID_MIN_SDK_VERSION := 24 +ANDROID_TARGET_SDK_VERSION := 34 ANDROID_ARMV7A_TARGETS := \ out/androiddebug-armv7a/tildefriends \ @@ -611,7 +612,8 @@ src/android/AndroidManifest.xml : $(firstword $(MAKEFILE_LIST)) @sed -i \ -e 's/versionCode=".*"/versionCode="$(VERSION_CODE)"/' \ -e 's/versionName=".*"/versionName="$(VERSION_NUMBER)"/' \ - -e 's/android:minSdkVersion=".*"/android:minSdkVersion="$(ANDROID_MIN_SDK_VERSION)"/' \ + -e 's/android:minSdkVersion="[[:digit:]]*"/android:minSdkVersion="$(ANDROID_MIN_SDK_VERSION)"/' \ + -e 's/android:targetSdkVersion="[[:digit:]]*"/android:targetSdkVersion="$(ANDROID_TARGET_SDK_VERSION)"/' \ $@ # Android support. diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml index bf6279cb..19a783a8 100644 --- a/src/android/AndroidManifest.xml +++ b/src/android/AndroidManifest.xml @@ -3,14 +3,15 @@ package="com.unprompted.tildefriends" android:versionCode="12" android:versionName="0.0.12-wip"> - + + android:configChanges="orientation|screenSize" + android:exported="true"> diff --git a/src/trace.c b/src/trace.c index bf088133..f7dcb183 100644 --- a/src/trace.c +++ b/src/trace.c @@ -213,7 +213,7 @@ static tf_trace_thread_t* _tf_trace_get_thread(tf_trace_t* trace, pthread_t self { .id = self, }; -#if defined(__linux__) +#if defined(__linux__) && !defined(__ANDROID__) pthread_getname_np(self, found->name, sizeof(found->name)); #endif trace->threads = tf_resize_vec(trace->threads, sizeof(tf_trace_thread_t*) * (trace->threads_count + 1));