From 9b90588ccc240b60e9e72261f020b8c8c07f48c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20M=C3=BCller?= Date: Sat, 27 Jul 2024 16:40:05 +0200 Subject: [PATCH 1/3] Pin curl version to 8.8.0 for Android to fix library building --- scripts/compile_libs/gen_libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/compile_libs/gen_libs.sh b/scripts/compile_libs/gen_libs.sh index f9134c03c..e9a6436bc 100755 --- a/scripts/compile_libs/gen_libs.sh +++ b/scripts/compile_libs/gen_libs.sh @@ -80,7 +80,7 @@ cd compile_libs || exit 1 build_cmake_lib zlib https://github.com/madler/zlib build_cmake_lib png https://github.com/glennrp/libpng -build_cmake_lib curl https://github.com/curl/curl +build_cmake_lib curl https://github.com/curl/curl "curl-8_8_0" build_cmake_lib freetype2 https://gitlab.freedesktop.org/freetype/freetype build_cmake_lib sdl https://github.com/libsdl-org/SDL SDL2 build_cmake_lib ogg https://github.com/xiph/ogg From e46d2375bab79683bcf33e12cc61b9a18628ee0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20M=C3=BCller?= Date: Sat, 27 Jul 2024 16:40:05 +0200 Subject: [PATCH 2/3] Add note to Android README about using stable rust version --- scripts/android/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/android/README.md b/scripts/android/README.md index 561aaea13..a34bdc315 100644 --- a/scripts/android/README.md +++ b/scripts/android/README.md @@ -4,6 +4,7 @@ Requirements for building for Android - At least 10-15 GiB of free disk space. - First follow the general instructions for setting up https://github.com/ddnet/ddnet for building on Linux. This guide has only been tested on Linux. +- Note: Use a stable version of Rust. Using the nightly version results in linking errors. - Install the Android NDK (version 26) in the same location where Android Studio would unpack it (`~/Android/Sdk/ndk/`): ```shell From 24356bd029c7b14ff33aebfbf4d0b28d66bfdd03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20M=C3=BCller?= Date: Sat, 24 Aug 2024 13:44:30 +0200 Subject: [PATCH 3/3] Set `debuggable` flag in Gradle debug build So the debug build of the app can be debugged. --- scripts/android/files/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/android/files/build.gradle b/scripts/android/files/build.gradle index 1025f955e..31bb06bb6 100644 --- a/scripts/android/files/build.gradle +++ b/scripts/android/files/build.gradle @@ -43,6 +43,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } debug { + debuggable true minifyEnabled false shrinkResources false }