Skip to content

Commit ba57d78

Browse files
tamworthtamworth
authored
Merge pull request #434 from AgoraIO/dev/4.5.0_android
modify build script for ci
2 parents 0aab9dd + 3b57b5a commit ba57d78

2 files changed

Lines changed: 51 additions & 36 deletions

File tree

‎.github/ci/build/build_android.sh‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,31 @@ echo release_version: $release_version
4949
echo short_version: $short_version
5050
echo pwd: `pwd`
5151
echo sdk_url: $sdk_url
52+
unzip_name=Agora_Native_SDK_for_Android_FULL
53+
if [ -z "$sdk_url" ]; then
54+
echo "sdk_url is empty"
55+
echo unzip_name: $unzip_name
56+
else
57+
zip_name=${sdk_url##*/}
58+
echo zip_name: $zip_name
5259

53-
zip_name=${sdk_url##*/}
54-
echo zip_name: $zip_name
60+
# env LC_ALL=en_US.UTF-8 python3 $WORKSPACE/artifactory_utils.py --action=download_file --file=$sdk_url || exit 1
61+
curl -o $zip_name $sdk_url || exit 1
62+
7za x ./$zip_name -y > log.txt
5563

56-
# env LC_ALL=en_US.UTF-8 python3 $WORKSPACE/artifactory_utils.py --action=download_file --file=$sdk_url || exit 1
57-
curl -o $zip_name $sdk_url || exit 1
58-
7za x ./$zip_name -y > log.txt
59-
60-
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
61-
echo unzip_name: $unzip_name
62-
63-
rm -rf ./$unzip_name/rtc/bin
64-
rm -rf ./$unzip_name/rtc/demo
65-
rm ./$unzip_name/rtc/commits
66-
rm ./$unzip_name/rtc/package_size_report.txt
67-
mkdir ./$unzip_name/rtc/samples
64+
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
65+
echo unzip_name: $unzip_name
6866

67+
rm -rf ./$unzip_name/rtc/bin
68+
rm -rf ./$unzip_name/rtc/demo
69+
rm ./$unzip_name/rtc/commits
70+
rm ./$unzip_name/rtc/package_size_report.txt
71+
fi
72+
mkdir -p ./$unzip_name/rtc/samples
6973
cp -rf ./Android/${android_direction} ./$unzip_name/rtc/samples/API-Example || exit 1
7074
7za a -tzip result.zip -r $unzip_name > log.txt
7175
mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
7276

73-
7477
if [ $compile_project = true ]; then
7578
# install android sdk
7679
which java
@@ -79,7 +82,12 @@ if [ $compile_project = true ]; then
7982
export ANDROID_HOME=/usr/lib/android_sdk
8083
echo ANDROID_HOME: $ANDROID_HOME
8184
cd ./$unzip_name/rtc/samples/API-Example || exit 1
82-
./cloud_build.sh || exit 1
85+
if [ -z "$sdk_url" ]; then
86+
./cloud_build.sh false || exit 1
87+
else
88+
./cloud_build.sh true || exit 1
89+
fi
90+
8391
fi
8492

8593

‎Android/APIExample/cloud_build.sh‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,34 @@ sed -i -e "s#YOUR APP ID#${APP_ID}#g" app/src/main/res/values/string_configs.xml
1212
sed -i -e "s#YOUR APP CERTIFICATE##g" app/src/main/res/values/string_configs.xml
1313
sed -i -e "s#YOUR ACCESS TOKEN##g" app/src/main/res/values/string_configs.xml
1414
rm -f app/src/main/res/values/string_configs.xml-e
15+
echo "First argument: $1"
16+
echo "Second argument: $2"
17+
if [ "$1" = "false" ]; then
18+
echo "clould build sdk_url is empty"
19+
else
20+
echo "clould build sdk_url is not empty"
21+
## config simple filter
22+
sed -i -e "s#simpleFilter = false#simpleFilter = true#g" gradle.properties
23+
rm -f gradle.properties-e
24+
mkdir -p agora-simple-filter/src/main/agoraLibs
25+
cp -r ../../sdk/arm64-v8a agora-simple-filter/src/main/agoraLibs/
26+
cp -r ../../sdk/armeabi-v7a agora-simple-filter/src/main/agoraLibs/
27+
curl -o opencv4.zip https://agora-adc-artifacts.s3.cn-north-1.amazonaws.com.cn/androidLibs/opencv4.zip
28+
unzip opencv4.zip
29+
mkdir -p agora-simple-filter/src/main/libs
30+
mv arm64-v8a agora-simple-filter/src/main/libs
31+
mv armeabi-v7a agora-simple-filter/src/main/libs
32+
sed -i -e "s#jniLibs/#libs/#g" agora-simple-filter/src/main/cpp/CMakeLists.txt
33+
rm -f agora-simple-filter/src/main/cpp/CMakeLists.txt-e
34+
35+
## config agora stream encrypt
36+
sed -i -e "s#streamEncrypt = false#streamEncrypt = true#g" gradle.properties
37+
rm -f gradle.properties-e
38+
mkdir -p agora-stream-encrypt/src/main/agoraLibs
39+
cp -r ../../sdk/arm64-v8a agora-stream-encrypt/src/main/agoraLibs/
40+
cp -r ../../sdk/armeabi-v7a agora-stream-encrypt/src/main/agoraLibs/
41+
fi
1542

16-
## config simple filter
17-
sed -i -e "s#simpleFilter = false#simpleFilter = true#g" gradle.properties
18-
rm -f gradle.properties-e
19-
mkdir -p agora-simple-filter/src/main/agoraLibs
20-
cp -r ../../sdk/arm64-v8a agora-simple-filter/src/main/agoraLibs/
21-
cp -r ../../sdk/armeabi-v7a agora-simple-filter/src/main/agoraLibs/
22-
curl -o opencv4.zip https://agora-adc-artifacts.s3.cn-north-1.amazonaws.com.cn/androidLibs/opencv4.zip
23-
unzip opencv4.zip
24-
mkdir -p agora-simple-filter/src/main/libs
25-
mv arm64-v8a agora-simple-filter/src/main/libs
26-
mv armeabi-v7a agora-simple-filter/src/main/libs
27-
sed -i -e "s#jniLibs/#libs/#g" agora-simple-filter/src/main/cpp/CMakeLists.txt
28-
rm -f agora-simple-filter/src/main/cpp/CMakeLists.txt-e
29-
30-
## config agora stream encrypt
31-
sed -i -e "s#streamEncrypt = false#streamEncrypt = true#g" gradle.properties
32-
rm -f gradle.properties-e
33-
mkdir -p agora-stream-encrypt/src/main/agoraLibs
34-
cp -r ../../sdk/arm64-v8a agora-stream-encrypt/src/main/agoraLibs/
35-
cp -r ../../sdk/armeabi-v7a agora-stream-encrypt/src/main/agoraLibs/
3643

3744
## config beauty
3845
sed -i -e "s#io.agora.api.example#io.agora.entfull#g" app/build.gradle

0 commit comments

Comments
 (0)