Skip to content

Commit 82f0471

Browse files
committed
Feat[build]: use ANGLE builder repo
1 parent 4d91e90 commit 82f0471

3 files changed

Lines changed: 8 additions & 35 deletions

File tree

.github/workflows/android.yml

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,45 +20,17 @@ jobs:
2020
cache: gradle
2121

2222
- name: Create libs directory
23-
run: mkdir ./app/src/main/jniLibs
23+
run: mkdir ./app/libs
2424

25-
- name: Download arm artifact
25+
- name: Download AAR
2626
uses: dawidd6/action-download-artifact@v11
2727
with:
28-
name: angle-libs-arm
29-
path: ./app/src/main/jniLibs/armeabi-v7a/
30-
repo: ${{ env.ANGLE_REPO }}
31-
workflow: angle-android.yml
28+
name: angle-aar
29+
path: ./app/libs
30+
repo: MojoLauncher/angle-builder
31+
workflow: blank.yml
3232
workflow_conclusion: success
3333

34-
- name: Download arm64 artifact
35-
uses: dawidd6/action-download-artifact@v11
36-
with:
37-
name: angle-libs-arm64
38-
path: ./app/src/main/jniLibs/arm64-v8a/
39-
repo: ${{ env.ANGLE_REPO }}
40-
workflow: angle-android.yml
41-
workflow_conclusion: success
42-
43-
- name: Download x86 artifact
44-
uses: dawidd6/action-download-artifact@v11
45-
with:
46-
name: angle-libs-x86
47-
path: ./app/src/main/jniLibs/x86/
48-
repo: ${{ env.ANGLE_REPO }}
49-
workflow: angle-android.yml
50-
workflow_conclusion: success
51-
52-
- name: Download x86_64 artifact
53-
uses: dawidd6/action-download-artifact@v11
54-
with:
55-
name: angle-libs-x64
56-
path: ./app/src/main/jniLibs/x86_64/
57-
repo: ${{ env.ANGLE_REPO }}
58-
workflow: angle-android.yml
59-
workflow_conclusion: success
60-
61-
6234
- name: Grant execute permission for gradlew
6335
run: chmod +x gradlew
6436
- name: Build with Gradle

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/ffmpeg-kit/
1414
/app/libs/lib/
1515
/app/libs/libraries.jar
16+
/app/libs/angle.aar
1617
.externalNativeBuild
1718
.cxx
1819
local.properties

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ android {
3232
}
3333

3434
dependencies {
35-
implementation fileTree(dir: 'libs', include: '*.jar')
35+
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
3636
}

0 commit comments

Comments
 (0)