Skip to content

CI Optimizations and Fixes #15

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

Merged
jpcottin merged 1 commit into from
May 31, 2026
Merged

CI Optimizations and Fixes #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ jobs:
arch: x86_64
target: google_apis
profile: pixel_6
emulator-options: -no-window -no-snapshot -noaudio -no-boot-anim
script: ./gradlew connectedDebugAndroidTest --no-daemon

- name: Upload instrumented test results
Expand Down
11 changes: 9 additions & 2 deletions app/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,15 @@ endif()

# Clang 21 (NDK r29) triggers BOOST_ASIO_HAS_STD_ALIGNED_ALLOC auto-detection but the
# Android sysroot doesn't expose std::aligned_alloc reliably; use Boost's own impl.
target_compile_options(torrent-rasterbar PRIVATE "-DBOOST_ASIO_DISABLE_STD_ALIGNED_ALLOC")
target_compile_options(simpletorrent PRIVATE "-DBOOST_ASIO_DISABLE_STD_ALIGNED_ALLOC")
# Also suppress C++17 deprecated redundant constexpr static member definitions.
target_compile_options(torrent-rasterbar PRIVATE
"-DBOOST_ASIO_DISABLE_STD_ALIGNED_ALLOC"
"-Wno-deprecated-redundant-constexpr-static-def"
)
target_compile_options(simpletorrent PRIVATE
"-DBOOST_ASIO_DISABLE_STD_ALIGNED_ALLOC"
"-Wno-deprecated-redundant-constexpr-static-def"
)

target_link_libraries(simpletorrent
PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/jpcottin/simpletorrent/ui/player/PlayerScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ fun PlayerScreen(filePath: String, title: String, onBack: () -> Unit) {
@Suppress("DEPRECATION")
val format = group.getTrackFormat(j)
val label = format.language?.let { lang ->
Locale(lang).displayLanguage.takeIf { it.isNotEmpty() } ?: lang
Locale.forLanguageTag(lang).displayLanguage.takeIf { it.isNotEmpty() } ?: lang
} ?: format.label ?: "Track ${j + 1}"
audioTrackOptions.add(AudioTrackOption(group, j, label))
}
Expand Down