Skip to content
Merged
Changes from all commits
Commits
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: 3 additions & 2 deletions .github/actions/configure-cmake-project/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -430,14 +430,15 @@ runs:
Add-KeyValueIfNew $Defines CMAKE_ANDROID_API "$AndroidAPILevel"
Add-KeyValueIfNew $Defines CMAKE_ANDROID_ARCH_ABI "$AndroidArchABI"
Add-KeyValueIfNew $Defines CMAKE_ANDROID_NDK "$AndroidNDKPath"
Add-KeyValueIfNew $Defines CMAKE_SYSROOT "$AndroidSysroot"

if ($UseASM) {
}

if ($UseC) {
Add-KeyValueIfNew $Defines CMAKE_C_COMPILER_TARGET $Triple

$CFLAGS = @("--sysroot=${AndroidSysroot}", "-ffunction-sections", "-fdata-sections")
$CFLAGS = @("-ffunction-sections", "-fdata-sections")
if ($DebugInfo) {
# Note: On GHA, we build Android with `-gsplit-dwarf`.
$CFLAGS += @("-g", "-gsplit-dwarf")
Expand All @@ -448,7 +449,7 @@ runs:
if ($UseCXX) {
Add-KeyValueIfNew $Defines CMAKE_CXX_COMPILER_TARGET $Triple

$CXXFLAGS = @("--sysroot=${AndroidSysroot}", "-ffunction-sections", "-fdata-sections")
$CXXFLAGS = @("-ffunction-sections", "-fdata-sections")
if ($DebugInfo) {
# Note: On GHA, we build Android with `-gsplit-dwarf`.
$CXXFLAGS += @("-g", "-gsplit-dwarf")
Expand Down