diff --git a/.github/workflows/rebuildDependencies.yml b/.github/workflows/rebuildDependencies.yml index 6f1d175..1fcbc30 100644 --- a/.github/workflows/rebuildDependencies.yml +++ b/.github/workflows/rebuildDependencies.yml @@ -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"]' diff --git a/conan_profiles/android-x86 b/conan_profiles/android-x86 new file mode 100644 index 0000000..557c1bc --- /dev/null +++ b/conan_profiles/android-x86 @@ -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 + + diff --git a/conan_profiles/android-x86-ndk b/conan_profiles/android-x86-ndk new file mode 100644 index 0000000..f49e3ca --- /dev/null +++ b/conan_profiles/android-x86-ndk @@ -0,0 +1,2 @@ +include(android-x86) +include(base/android-ndk) diff --git a/conan_profiles/base/common b/conan_profiles/base/common index 86f357b..a688cc9 100644 --- a/conan_profiles/base/common +++ b/conan_profiles/base/common @@ -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