Skip to content

Commit 3f5b2ac

Browse files
xgfd3xgfd3
committed
[Android]adjust ci config.
1 parent 40722ac commit 3f5b2ac

3 files changed

Lines changed: 31 additions & 19 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ rm ./$unzip_name/commits
6767
rm ./$unzip_name/package_size_report.txt
6868
mkdir ./$unzip_name/samples
6969
mkdir ./$unzip_name/samples/API-example
70-
cp -rf ./Android/** ./$unzip_name/samples/API-example
70+
cp -rf ./Android/APIExample/** ./$unzip_name/samples/API-example
7171
7za a -tzip result.zip -r $unzip_name
72-
cp result.zip $WORKSPACE/withAPIExample_$zip_name
72+
cp result.zip $WORKSPACE/withAPIExample_$zip_name

‎Android/APIExample/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ Test/
2020
# sdk files
2121
*.so
2222
agora-rtc-sdk.jar
23+
AgoraScreenShareExtension.aar
2324
/release

‎Android/APIExample/app/build.gradle‎

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apply plugin: 'com.android.application'
22
apply plugin: "androidx.navigation.safeargs"
33

4+
def localSdkPath= "${rootProject.projectDir.absolutePath}/../../sdk"
5+
46
android {
57
compileSdkVersion 31
68
buildToolsVersion "31.0.0"
@@ -29,7 +31,10 @@ android {
2931

3032
sourceSets {
3133
main {
32-
jniLibs.srcDirs = ['src/main/jniLibs']
34+
jniLibs.srcDirs += 'src/main/jniLibs'
35+
if(new File("${localSdkPath}").exists()){
36+
jniLibs.srcDirs += "${localSdkPath}"
37+
}
3338
}
3439
}
3540

@@ -39,22 +44,28 @@ android {
3944
dependencies {
4045
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
4146

42-
def agora_sdk_version = "4.0.0-rc.1"
43-
// case 1: full single lib
44-
implementation "io.agora.rtc:full-sdk:${agora_sdk_version}"
45-
implementation "io.agora.rtc:full-screen-sharing:${agora_sdk_version}"
46-
// case 2: partial libs
47-
// implementation "io.agora.rtc:full-rtc-basic:${agora_sdk_version}"
48-
// implementation "io.agora.rtc:ains:${agora_sdk_version}"
49-
// implementation "io.agora.rtc:full-content-inspect:${agora_sdk_version}"
50-
// implementation "io.agora.rtc:full-virtual-background:${agora_sdk_version}"
51-
// implementation "io.agora.rtc:full-super-resolution:${agora_sdk_version}"
52-
// implementation "io.agora.rtc:spatial-audio:${agora_sdk_version}"
53-
// implementation "io.agora.rtc:audio-beauty:${agora_sdk_version}"
54-
// implementation "io.agora.rtc:clear-vision:${agora_sdk_version}"
55-
// implementation "io.agora.rtc:pvc:${agora_sdk_version}"
56-
// implementation "io.agora.rtc:screen-capture:${agora_sdk_version}"
57-
// implementation "io.agora.rtc:full-screen-sharing:${agora_sdk_version}"
47+
if(new File("${localSdkPath}").exists()){
48+
implementation fileTree(dir: "${localSdkPath}", include: ['*.jar', '*.aar'])
49+
}
50+
else{
51+
def agora_sdk_version = "4.0.0-rc.1"
52+
// case 1: full single lib
53+
implementation "io.agora.rtc:full-sdk:${agora_sdk_version}"
54+
implementation "io.agora.rtc:full-screen-sharing:${agora_sdk_version}"
55+
// case 2: partial libs
56+
// implementation "io.agora.rtc:full-rtc-basic:${agora_sdk_version}"
57+
// implementation "io.agora.rtc:ains:${agora_sdk_version}"
58+
// implementation "io.agora.rtc:full-content-inspect:${agora_sdk_version}"
59+
// implementation "io.agora.rtc:full-virtual-background:${agora_sdk_version}"
60+
// implementation "io.agora.rtc:full-super-resolution:${agora_sdk_version}"
61+
// implementation "io.agora.rtc:spatial-audio:${agora_sdk_version}"
62+
// implementation "io.agora.rtc:audio-beauty:${agora_sdk_version}"
63+
// implementation "io.agora.rtc:clear-vision:${agora_sdk_version}"
64+
// implementation "io.agora.rtc:pvc:${agora_sdk_version}"
65+
// implementation "io.agora.rtc:screen-capture:${agora_sdk_version}"
66+
// implementation "io.agora.rtc:full-screen-sharing:${agora_sdk_version}"
67+
}
68+
5869

5970
implementation 'androidx.appcompat:appcompat:1.1.0'
6071
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

0 commit comments

Comments
 (0)