Skip to content

Commit e3b7713

Browse files
author
eagleychen
committed
fix android env
1 parent 75112a2 commit e3b7713

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.github/workflows/android_debug_push.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616

1717
jobs:
1818
build:
19-
runs-on: macos-13
19+
runs-on: macos-14
2020
steps:
2121
- uses: actions/checkout@v3
2222
with:
@@ -30,6 +30,7 @@ jobs:
3030
- name: Build with Gradle
3131
run: |
3232
ls -l /Users/runner/work/iot-ijkplayer/iot-ijkplayer/android-ndk-r10e
33+
perl -i -pe "s#.*HOST_ARCH=x86_64.*#\t\tx86_64|amd64|arm64) HOST_ARCH=x86_64;;#g" /Users/runner/work/iot-ijkplayer/iot-ijkplayer/android-ndk-r10e/ndk-build
3334
export ANDROID_NDK=/Users/runner/work/iot-ijkplayer/iot-ijkplayer/android-ndk-r10e
3435
export ANDROID_NDK_ROOT=/Users/runner/work/iot-ijkplayer/iot-ijkplayer/android-ndk-r10e
3536

.github/workflows/android_release_push.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
build:
16-
runs-on: macos-13
16+
runs-on: macos-14
1717
steps:
1818
- uses: actions/checkout@v3
1919
with:
@@ -39,6 +39,7 @@ jobs:
3939
- name: Build with Gradle
4040
run: |
4141
ls -l /Users/runner/work/iot-ijkplayer/iot-ijkplayer/android-ndk-r10e
42+
perl -i -pe "s#.*HOST_ARCH=x86_64.*#\t\tx86_64|amd64|arm64) HOST_ARCH=x86_64;;#g" /Users/runner/work/iot-ijkplayer/iot-ijkplayer/android-ndk-r10e/ndk-build
4243
export ANDROID_NDK=/Users/runner/work/iot-ijkplayer/iot-ijkplayer/android-ndk-r10e
4344
export ANDROID_NDK_ROOT=/Users/runner/work/iot-ijkplayer/iot-ijkplayer/android-ndk-r10e
4445

android/contrib/tools/do-detect-env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ esac
8888

8989
case "$UNAME_S" in
9090
Darwin)
91-
export IJK_MAKE_FLAG=-j`sysctl -n machdep.cpu.thread_count`
91+
export IJK_MAKE_FLAG=-j2 #`sysctl -n machdep.cpu.thread_count`
9292
;;
9393
CYGWIN_NT-*)
9494
IJK_WIN_TEMP="$(cygpath -am /tmp)"

0 commit comments

Comments
 (0)