Skip to content

Add support for building Android x86 dependencies #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GeorgeK1ng wants to merge 13 commits into
base: main
Choose a base branch
from
+27 −1
Open

Add support for building Android x86 dependencies #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
221aef9
Android x86 profiles
GeorgeK1ng Nov 1, 2025
1841f75
Add Android x86 dependencies build support
GeorgeK1ng Nov 1, 2025
0cef1d3
opus vs ffmpeg fix
GeorgeK1ng Nov 1, 2025
e426ea9
Force shared build on Android x86
GeorgeK1ng Nov 1, 2025
180e8bc
Merge branch 'vcmi:main' into main
GeorgeK1ng Nov 26, 2025
26778b2
Update Android x86 profile settings and API level
GeorgeK1ng Nov 26, 2025
d935c9b
Modify Android x86 profile settings and options
GeorgeK1ng Nov 26, 2025
9b7b8b9
Update rebuildDependencies.yml workflow file
GeorgeK1ng Nov 27, 2025
6f2b4c0
Update rebuildDependencies.yml workflow file
GeorgeK1ng Nov 28, 2025
f31ee5a
Update opus version conflict resolution
GeorgeK1ng Nov 28, 2025
6878bf2
Update common
GeorgeK1ng Dec 3, 2025
b22b792
Merge branch 'vcmi:main' into main
GeorgeK1ng Dec 10, 2025
710750b
Update common
GeorgeK1ng Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/rebuildDependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ jobs:
os: ubuntu-latest
conan_profiles: '["android-64-ndk", "base/android-system"]'
conan_system_libs: zlib
- platform: android-x86
os: ubuntu-latest
before_install: android-32.sh
conan_profiles: '["android-x86-ndk", "base/android-system"]'
conan_system_libs: zlib
- platform: android-x64
os: ubuntu-latest
conan_profiles: '["android-x64-ndk", "base/android-system"]'
Expand Down
20 changes: 20 additions & 0 deletions conan_profiles/android-x86
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
include(base/android)

[settings]
arch=x86
os.api_level=21

[conf]
# remove after switching to API level >= 24
{% set file_funcs_macros = ['fseeko=fseek', 'ftello=ftell'] %}
flac/*:tools.build:defines={{ file_funcs_macros }}
luajit/*:tools.build:defines={{ file_funcs_macros }}
opusfile/*:tools.build:defines={{ file_funcs_macros }}

[options]
# Workaround for linker error:
# "relocation R_386_32 cannot be used against local symbol; recompile with -fPIC"
# Force mpg123 to build as shared to avoid non-PIC ASM objects on Android x86
mpg123/*:shared=True


2 changes: 2 additions & 0 deletions conan_profiles/android-x86-ndk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include(android-x86)
include(base/android-ndk)
1 change: 0 additions & 1 deletion conan_profiles/base/common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ ninja/1.12.1
[replace_requires]
# TODO: remove after https://github.com/conan-io/conan-center-index/pull/27125 is merged
# Qt 5 depends on 0.4.8, but it doesn't build for iOS
md4c/0.4.8: md4c/0.5.2

[conf]
tools.cmake.cmaketoolchain:generator=Ninja
Expand Down
Loading