Skip to content

Commit f0b61bd

Browse files
committed
fix: fix android build script
1 parent fa3612c commit f0b61bd

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

platforms/build-android.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,10 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
293293
MESON_CPU_FAMILY="aarch64"
294294
fi
295295

296+
export COMPILE_FLAGS="'--sysroot=${SYS_ROOT:?}','-fPIE','-fPIC','--target=$ARM_COMPILER_TRIPLE','-DHAVE_USR_INCLUDE_MALLOC_H','-D_MALLOC_H','-D__BITNESS=$BITNESS','-DAUDIO_PREFER_MP3'"
297+
298+
export LINK_FLAGS="'-fPIE','-L$SYS_ROOT/usr/lib'"
299+
296300
cat <<EOF >"./platforms/crossbuild-android-$ARM_TARGET_ARCH.ini"
297301
[host_machine]
298302
system = 'android'
@@ -320,10 +324,11 @@ llvm-config = '$LLVM_CONFIG'
320324
[built-in options]
321325
c_std = 'gnu11'
322326
cpp_std = 'c++23'
323-
c_args = ['--sysroot=${SYS_ROOT:?}','-fPIE','-fPIC','--target=$ARM_COMPILER_TRIPLE','-DHAVE_USR_INCLUDE_MALLOC_H','-D_MALLOC_H','-D__BITNESS=$BITNESS']
324-
cpp_args = ['--sysroot=${SYS_ROOT:?}','-fPIE','-fPIC','--target=$ARM_COMPILER_TRIPLE','-D__BITNESS=$BITNESS']
325-
c_link_args = ['-fPIE','-L$SYS_ROOT/usr/lib']
326-
cpp_link_args = ['-fPIE','-L$SYS_ROOT/usr/lib']
327+
c_args = [$COMPILE_FLAGS]
328+
cpp_args = [$COMPILE_FLAGS]
329+
c_link_args = [$LINK_FLAGS]
330+
cpp_link_args = [$LINK_FLAGS]
331+
327332
prefix = '$SYS_ROOT'
328333
libdir = '$LIB_PATH'
329334
@@ -369,7 +374,6 @@ EOF
369374
--cross-file "./platforms/crossbuild-android-$ARM_TARGET_ARCH.ini" \
370375
"-Dbuildtype=$BUILDTYPE" \
371376
-Dsdl2:use_hidapi=enabled \
372-
-Dcpp_args=-DAUDIO_PREFER_MP3 \
373377
-Dclang_libcpp=disabled
374378

375379
fi

0 commit comments

Comments
 (0)