GNUmakefile

@@ -178,13 +178,11 @@ $(WINDOWS_TARGETS): CFLAGS += \
 	-D_WIN32_WINNT=0x0A00 \
 	-DWINVER=0x0A00 \
 	-DNTDDI_VERSION=NTDDI_WIN10 \
-	-Ideps/openssl/mingw64/usr/local/include \
-	-flto
+	-Ideps/openssl/mingw64/usr/local/include
 $(WINDOWS_TARGETS): LDFLAGS += \
 	-static \
 	-lm \
-	-Ldeps/openssl/mingw64/usr/local/lib \
-	-flto
+	-Ldeps/openssl/mingw64/usr/local/lib
 ifeq ($(UNAME_S),Darwin)
 $(MACOS_TARGETS): CC = xcrun clang
 $(IOS_TARGETS): IOS_SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)
@@ -767,15 +765,8 @@ out/TildeFriends.aab: out/apk/classes.dex $(filter-out %debug%, $(ANDROID_TARGET
 	@mv out/aab/staging/AndroidManifest.xml out/aab/staging/manifest/AndroidManifest.xml
 	@cp out/apk/classes.dex out/aab/staging/dex/
 	@rm -fv out/base.zip
-	@mkdir -p out/aab/staging/lib/arm64-v8a out/aab/staging/lib/armeabi-v7a out/aab/staging/lib/x86_64 out/aab/staging/lib/x86
-	@cp out/androidrelease/tildefriends out/aab/staging/lib/arm64-v8a/libtildefriends.so
-	@cp out/androidrelease-armv7a/tildefriends out/aab/staging/lib/armeabi-v7a/libtildefriends.so
-	@cp out/androidrelease-x86_64/tildefriends out/aab/staging/lib/x86_64/libtildefriends.so
-	@cp out/androidrelease-x86/tildefriends out/aab/staging/lib/x86/libtildefriends.so
-	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/arm64-v8a/libtildefriends.so
-	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/armeabi-v7a/libtildefriends.so
-	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/x86_64/libtildefriends.so
-	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/x86/libtildefriends.so
+	@cp -r out/apk-arm-release/lib/ out/aab/staging/
+	@cp -r out/apk-x86-release/lib/ out/aab/staging/
 	@cp -r apps/ out/aab/staging/root/
 	@rm -rf out/aab/staging/root/apps/welcome*
 	@cp -r core/ out/aab/staging/root/

tools/ssl-mingw64

@@ -13,56 +13,7 @@ rm -rf $WORK_DIR
 cp -arf deps/openssl_src/ $WORK_DIR
 
 build_the_thing() {
-    export GLOBAL_OPTIONS="
-        no-apps
-        no-asm
-        no-async
-        no-autoerrinit
-        no-cmp
-        no-cms
-        no-comp
-        no-deprecated
-        no-dgram
-        no-docs
-        no-dsa
-        no-dso
-        no-dtls
-        no-dynamic-engine
-        no-ec2m
-        no-egd
-        no-engine
-        no-err
-        no-filenames
-        no-gost
-        no-http
-        no-idea
-        no-legacy
-        no-md2
-        no-md4
-        no-module
-        no-multiblock
-        no-nextprotoneg
-        no-ocsp
-        no-psk
-        no-shared
-        no-sock
-        no-srp
-        no-ssl-trace
-        no-ssl3
-        no-stdio
-        no-tests
-        no-thread-pool
-        no-threads
-        no-trace
-        no-ui-console
-        no-uplink
-        no-weak-ssl-ciphers
-        no-zlib
-        -Os
-        -ffunction-sections
-        -fdata-sections
-        -flto
-        -DOPENSSL_SMALL_FOOTPRINT"
+    export GLOBAL_OPTIONS="no-trace no-asm no-threads no-md2 no-md4 no-dso no-async no-multiblock no-dgram no-filenames no-shared no-ssl3 no-engine no-dynamic-engine no-zlib no-comp no-psk no-idea no-srp no-weak-ssl-ciphers no-dtls no-egd no-tests -Os"
     echo "./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS" && \
     ./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS && \
     make clean && \