Skip to content

Commit 7d8227e

Browse files
authored
Update android.yml
1 parent 9930d7a commit 7d8227e

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/android.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
build:
88
strategy:
99
matrix:
10-
arch: ["x86_64", "arm32", "arm64", "arm64-fastdebug"] # "x86_64", "arm32",
10+
arch: [ "arm64", "arm64-fastdebug"] # "x86_64", "arm32",
1111
fail-fast: false
1212

1313
name: "Build for Android ${{matrix.arch}}"
@@ -25,7 +25,6 @@ jobs:
2525
with:
2626
path: |
2727
depot_tools
28-
.gclient
2928
third_party/llvm-build
3029
tools/flex-bison
3130
key: depot-tools-${{ runner.os }}-${{ hashFiles('.gclient') }}
@@ -36,7 +35,7 @@ jobs:
3635
if: steps.cache-depot-tools.outputs.cache-hit != 'true'
3736
shell: bash
3837
run: |
39-
sudo rm -rf /usr/local/lib/android/sdk
38+
rm -rf /usr/local/lib/android/sdk
4039
git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
4140
4241
- name: Run gclient sync
@@ -45,7 +44,7 @@ jobs:
4544
export PATH=`pwd`/depot_tools:$PATH
4645
4746
if [ ! -f .gclient ]; then
48-
vpython3 scripts/bootstrap.py
47+
python3 scripts/bootstrap.py
4948
fi
5049
5150
COMMIT_COUNT=$(git ls-remote origin | wc -l)
@@ -71,6 +70,7 @@ jobs:
7170
export PATH=`pwd`/depot_tools:$PATH
7271
export NDK_CCACHE="ccache"
7372
echo $PATH
73+
cp .gn .gn.bak 2>/dev/null; if grep -q 'expand_directory_allowlist' .gn 2>/dev/null; then sed -i 's|]|,\n "//build/modules/BUILD.gn"\n]|' .gn; else echo 'expand_directory_allowlist = [ "//build/modules/BUILD.gn" ]' >> .gn; fi
7474
gn gen out/Android-${{matrix.arch}} --threads=$(nproc)
7575
gn args out/Android-${{ matrix.arch }} --list --short
7676
autoninja -C out/Android-${{matrix.arch}} -j $(nproc)

0 commit comments

Comments
 (0)