Merge pull request #8802 from Robyt3/Android-Building-Small-Fixes

Minor improvements to Android building
This commit is contained in:
Dennis Felsing 2024-08-24 15:05:16 +00:00 committed by GitHub
commit 4786419fee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 1 deletions

View file

@ -4,6 +4,7 @@ Requirements for building for Android
- At least 10-15 GiB of free disk space. - 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. - 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. 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 - Install the Android NDK (version 26) in the same location
where Android Studio would unpack it (`~/Android/Sdk/ndk/`): where Android Studio would unpack it (`~/Android/Sdk/ndk/`):
```shell ```shell

View file

@ -43,6 +43,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
debug { debug {
debuggable true
minifyEnabled false minifyEnabled false
shrinkResources false shrinkResources false
} }

View file

@ -80,7 +80,7 @@ cd compile_libs || exit 1
build_cmake_lib zlib https://github.com/madler/zlib build_cmake_lib zlib https://github.com/madler/zlib
build_cmake_lib png https://github.com/glennrp/libpng 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 freetype2 https://gitlab.freedesktop.org/freetype/freetype
build_cmake_lib sdl https://github.com/libsdl-org/SDL SDL2 build_cmake_lib sdl https://github.com/libsdl-org/SDL SDL2
build_cmake_lib ogg https://github.com/xiph/ogg build_cmake_lib ogg https://github.com/xiph/ogg