Skip to content

Commit 7ab9687

Browse files
committed
when compile android libs no need call make_xcfmwk_bundle
1 parent 0394e6a commit 7ab9687

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/onestep.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function compile_android_platform
7373
cd $ROOT_DIR
7474
}
7575

76-
function make_bundle()
76+
function make_xcfmwk_bundle()
7777
{
7878
echo "---Zip apple xcframework--------------------------------------"
7979
cd build/product/xcframework
@@ -103,25 +103,24 @@ function main()
103103
ios)
104104
init_platform $PLAT
105105
compile_ios_platform
106-
make_bundle
106+
make_xcfmwk_bundle
107107
publish
108108
;;
109109
macos)
110110
init_platform $PLAT
111111
compile_macos_platform
112-
make_bundle
112+
make_xcfmwk_bundle
113113
publish
114114
;;
115115
tvos)
116116
init_platform $PLAT
117117
compile_tvos_platform
118-
make_bundle
118+
make_xcfmwk_bundle
119119
publish
120120
;;
121121
android)
122122
init_platform $PLAT
123123
compile_android_platform
124-
make_bundle
125124
publish
126125
;;
127126
all)
@@ -131,7 +130,7 @@ function main()
131130
compile_macos_platform
132131
init_platform tvos
133132
compile_tvos_platform
134-
make_bundle
133+
make_xcfmwk_bundle
135134

136135
init_platform android
137136
compile_android_platform

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@ At present MRFFToolChain contained `ass、bluray、dav1d、dvdread、ffmpeg、fr
2525

2626
## Denpendency
2727

28+
- Fontconfig: xml2
2829
- Harfbuzz: freetype
29-
- Ass: harfbuzz,fribidi,unibreak
30-
- FFmpeg: openssl,opus,dav1d,dvdread,uavs3d,libsmb2
30+
- Ass for Appple: harfbuzz,fribidi,unibreak
31+
- Ass for Android: harfbuzz,fribidi,unibreak,fontconfig
32+
- FFmpeg for Appple: openssl,opus,dav1d,dvdread,uavs3d,smb2
33+
- FFmpeg for Android: openssl,opus,dav1d,dvdread,uavs3d,smb2,soundtouch
3134

3235
Tips:
3336

0 commit comments

Comments
 (0)