diff --git a/GNUmakefile b/GNUmakefile index 41684da0..f76df100 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -21,6 +21,10 @@ BUNDLETOOL = out/bundletool.jar HAVE_WIN := 0 +ifeq ($(shell test -d .git && which git > /dev/null && echo 1),1) +export SOURCE_DATE_EPOCH=$(shell git log -1 --pretty=%ct) +endif + ifeq ($(UNAME_S),Darwin) BUILD_TYPES := macosdebug macosrelease iosdebug iosrelease iossimdebug iossimrelease else ifeq ($(UNAME_S),Linux) @@ -67,11 +71,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 \ diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml index b2255d65..f7fe07a4 100644 --- a/src/android/AndroidManifest.xml +++ b/src/android/AndroidManifest.xml @@ -6,8 +6,7 @@ + android:usesCleartextTraffic="true">