Skip to content

Commit e37d5f2

Browse files
committed
fix: remove unused and invalid cpp_args from android build script
1 parent f0b61bd commit e37d5f2

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

platforms/build-android.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ 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'"
296+
export COMPILE_FLAGS="'--sysroot=${SYS_ROOT:?}','-fPIE','-fPIC','--target=$ARM_COMPILER_TRIPLE','-DAUDIO_PREFER_MP3'"
297297

298298
export LINK_FLAGS="'-fPIE','-L$SYS_ROOT/usr/lib'"
299299

@@ -338,12 +338,14 @@ sys_root = '${SYS_ROOT}'
338338
339339
EOF
340340

341-
if [ ! -d "$PWD/subprojects/cpu-features" ]; then
342-
mkdir -p "$PWD/subprojects/cpu-features/src/"
343-
mkdir -p "$PWD/subprojects/cpu-features/include/"
344-
ln -s "$BASE_PATH/sources/android/cpufeatures/cpu-features.c" "$PWD/subprojects/cpu-features/src/cpu-features.c"
345-
ln -s "$BASE_PATH/sources/android/cpufeatures/cpu-features.h" "$PWD/subprojects/cpu-features/include/cpu-features.h"
346-
cat <<EOF >"$PWD/subprojects/cpu-features/meson.build"
341+
CPU_FUTURES_ROOT="$PWD/subprojects/cpu-features"
342+
343+
if [ ! -d "$CPU_FUTURES_ROOT" ]; then
344+
mkdir -p "$CPU_FUTURES_ROOT/src/"
345+
mkdir -p "$CPU_FUTURES_ROOT/include/"
346+
ln -s "$BASE_PATH/sources/android/cpufeatures/cpu-features.c" "$CPU_FUTURES_ROOT/src/cpu-features.c"
347+
ln -s "$BASE_PATH/sources/android/cpufeatures/cpu-features.h" "$CPU_FUTURES_ROOT/include/cpu-features.h"
348+
cat <<EOF >"$CPU_FUTURES_ROOT/meson.build"
347349
project('cpu-features','c')
348350
349351
meson.override_dependency(

0 commit comments

Comments
 (0)