Skip to content

Commit 317d9b2

Browse files
committed
CI: android:
- fix mpg123 error on x86, the reason it existed was: the assembly that was used was detecting features of the HOST platform and not the TARGET platform, so SSE code was generated for x86, which has no SSE
1 parent ea95dee commit 317d9b2

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

platforms/build-android.sh

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,13 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
177177

178178
cd "$BUILD_DIR_MPG123"
179179

180-
wget -q "https://www.mpg123.de/download/mpg123-1.32.6.tar.bz2"
180+
if [ ! -e "mpg123-1.32.6.tar.bz2" ]; then
181+
wget -q "https://www.mpg123.de/download/mpg123-1.32.6.tar.bz2"
182+
fi
181183

182-
tar -xf "mpg123-1.32.6.tar.bz2"
184+
if [ ! -d "mpg123-1.32.6" ]; then
185+
tar -xf "mpg123-1.32.6.tar.bz2"
186+
fi
183187

184188
cd "mpg123-1.32.6"
185189

@@ -203,7 +207,8 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
203207

204208
cd "$BUILD_DIR_MPG123"
205209

206-
cmake .. --install-prefix "$SYS_ROOT/usr" "-DCMAKE_SYSROOT=$SYS_ROOT" -DOUTPUT_MODULES=dummy -DCMAKE_POSITION_INDEPENDENT_CODE=ON
210+
cmake .. --install-prefix "$SYS_ROOT/usr" "-DCMAKE_SYSROOT=$SYS_ROOT" -DOUTPUT_MODULES=dummy -DCMAKE_POSITION_INDEPENDENT_CODE=ON "-DCMAKE_HOST_SYSTEM_PROCESSOR=$ARCH_VERSION"
211+
207212
cmake --build .
208213

209214
cmake --install .
@@ -233,11 +238,11 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
233238
cd "$BUILD_DIR_OPENSSL"
234239

235240
if [ ! -e "openssl-3.3.0.tar.gz" ]; then
236-
wget -q "https://github.com/openssl/openssl/releases/download/openssl-3.3.0/openssl-3.3.0.tar.gz"
241+
wget -q "https://github.com/openssl/openssl/releases/download/openssl-3.3.0/openssl-3.3.0.tar.gz"
237242
fi
238243

239244
if [ ! -d "openssl-3.3.0" ]; then
240-
tar -xzf "openssl-3.3.0.tar.gz"
245+
tar -xzf "openssl-3.3.0.tar.gz"
241246
fi
242247

243248
cd "openssl-3.3.0"
@@ -250,7 +255,7 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
250255

251256
./Configure --prefix="$SYS_ROOT/usr" no-asm no-tests no-shared "$OPENSSL_TARGET_ARCH" "-D__ANDROID_API__=$SDK_VERSION"
252257
else
253-
./Configure --prefix="$SYS_ROOT/usr" no-tests no-shared "$OPENSSL_TARGET_ARCH" "-D__ANDROID_API__=$SDK_VERSION"
258+
./Configure --prefix="$SYS_ROOT/usr" no-tests no-shared "$OPENSSL_TARGET_ARCH" "-D__ANDROID_API__=$SDK_VERSION"
254259
fi
255260

256261
make clean

0 commit comments

Comments
 (0)