Skip to content

Commit 404033f

Browse files
plutolessplutoless
authored
Merge pull request #156 from AgoraIO/dev/3.4.2
Dev/3.4.2
2 parents 9a0a0b3 + 64203b2 commit 404033f

37 files changed

+15527
-7
lines changed

‎Android/APIExample/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,5 @@ dependencies {
6060
implementation project(path: ':lib-raw-data')
6161
implementation project(path: ':lib-switch-external-video')
6262
implementation project(path: ':lib-screensharing')
63+
implementation project(path: ':lib-player-helper')
6364
}

‎Android/APIExample/app/libs/RtcChannelPublishHelper.aar

-616 KB
Binary file not shown.

‎Android/APIExample/lib-component/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
3131
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
3232

33-
api 'com.github.agorabuilder:native-full-sdk:3.4.0'
34-
api 'io.agora:agoraplayer:1.2.2'
33+
api 'com.github.agorabuilder:native-full-sdk:3.4.2'
34+
api 'io.agora:agoraplayer:1.2.4'
3535

3636
}

‎Android/APIExample/lib-player-helper/.gitignore

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# built application files
2+
*.apk
3+
*.ap_
4+
5+
# files for the dex VM
6+
*.dex
7+
8+
# Java class files
9+
*.class
10+
11+
# Mobile Tools for Java (J2ME)
12+
.mtj.tmp/
13+
14+
15+
# generated files
16+
bin/
17+
obj
18+
obj/local
19+
gen/
20+
bin/dexedLibs
21+
bin/res
22+
bin/*.xml
23+
bin/classes
24+
bin/res
25+
bin/jarlist.cache
26+
*.cache
27+
28+
# Local configuration file (sdk path, etc)
29+
local.properties
30+
31+
# Eclipse project files
32+
.classpath
33+
.project
34+
35+
# Proguard folder generated by Eclipse
36+
proguard/
37+
38+
# Intellij project files
39+
*.iml
40+
*.ipr
41+
*.iws
42+
43+
# Gradle
44+
.gradle/
45+
.gradle
46+
build/
47+
build
48+
.externalNativeBuild/
49+
.externalNativeBuild
50+
# gedit
51+
*~
52+
53+
.idea/*.xml
54+
!.idea/codeStyleSettings.xml
55+
!.idea/copyright/*.xml
56+
!.idea/fileColors.xml
57+
!.idea/encodings.xml
58+
!.idea/gradle.xml
59+
!.idea/runConfigurations/*.xml
60+
61+
!.idea/inspectionProfiles/*.xml
62+
.idea/inspectionProfiles/profiles_settings.xml
63+
64+
!.idea/scopes/*.xml
65+
.idea/scopes/scope_settings.xml
66+
67+
!.idea/templateLanguages.xml
68+
!.idea/vcs.xml
69+
profiles_settings.xml
70+
.idea/libraries

‎Android/APIExample/lib-player-helper/CMakeLists.txt

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# For more information about using CMake with Android Studio, read the
2+
# documentation: https://d.android.com/studio/projects/add-native-code.html
3+
4+
# Sets the minimum version of CMake required to build the native library.
5+
6+
cmake_minimum_required(VERSION 3.4.1)
7+
8+
# Creates and names a library, sets it as either STATIC
9+
# or SHARED, and provides the relative paths to its source code.
10+
# You can define multiple libraries, and CMake builds them for you.
11+
# Gradle automatically packages shared libraries with your APK.
12+
13+
include_directories(src/main/cpp/include)
14+
add_library( # Sets the name of the library.
15+
16+
apm-plugin-agora-rtc-player
17+
# Sets the library as a shared library.
18+
SHARED
19+
src/main/cpp/agora_plugin_rtc.cpp
20+
)
21+
22+
# Searches for a specified prebuilt library and stores the path as a
23+
# variable. Because CMake includes system libraries in the search path by
24+
# default, you only need to specify the name of the public NDK library
25+
# you want to add. CMake verifies that the library exists before
26+
# completing its build.
27+
28+
find_library( # Sets the name of the path variable.
29+
log-lib
30+
31+
# Specifies the name of the NDK library that
32+
# you want CMake to locate.
33+
log )
34+
35+
# Specifies libraries CMake should link to your target library. You
36+
# can link multiple libraries, such as libraries you define in this
37+
# build script, prebuilt third-party libraries, or system libraries.
38+
39+
target_link_libraries( # Specifies the target library.
40+
apm-plugin-agora-rtc-player
41+
android
42+
# Links the target library to the log library
43+
# included in the NDK.
44+
${log-lib} )

‎Android/APIExample/lib-player-helper/build.gradle

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
apply plugin: 'com.android.library'
2+
3+
android {
4+
compileSdkVersion 26
5+
flavorDimensions "default"
6+
7+
defaultConfig {
8+
minSdkVersion 18
9+
targetSdkVersion 26
10+
versionCode 5
11+
versionName "1.0"
12+
externalNativeBuild {
13+
cmake {
14+
cppFlags "-std=c++11 "
15+
}
16+
}
17+
18+
ndk {
19+
abiFilters "armeabi-v7a","arm64-v8a","x86"
20+
}
21+
}
22+
23+
24+
buildTypes {
25+
release {
26+
minifyEnabled false
27+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
28+
}
29+
}
30+
31+
externalNativeBuild {
32+
cmake {
33+
path "CMakeLists.txt"
34+
}
35+
}
36+
37+
android.libraryVariants.all { variant ->
38+
variant.outputs.all {
39+
outputFileName = "RtcChannelPublishHelper"+'.aar'
40+
}
41+
}
42+
43+
compileOptions {
44+
sourceCompatibility JavaVersion.VERSION_1_7
45+
targetCompatibility JavaVersion.VERSION_1_7
46+
}
47+
}
48+
49+
dependencies {
50+
implementation fileTree(dir: 'libs', include: ['*.jar'])
51+
implementation 'androidx.appcompat:appcompat:1.1.0'
52+
api project(path: ':lib-component')
53+
}

‎Android/APIExample/lib-player-helper/gradle/wrapper/gradle-wrapper.jar

52.4 KB
Binary file not shown.

‎Android/APIExample/lib-player-helper/gradle/wrapper/gradle-wrapper.properties

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Wed Oct 21 11:34:03 PDT 2015
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

‎Android/APIExample/lib-player-helper/libs/PLACEHOLDER

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
libagora-rtc-sdk-jni.so
2+
libagora-crypto.so

‎Android/APIExample/lib-player-helper/proguard-rules.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# To enable ProGuard in your project, edit project.properties
2+
# to define the proguard.config property as described in that file.
3+
#
4+
# Add project specific ProGuard rules here.
5+
# By default, the flags in this file are appended to flags specified
6+
# in ${sdk.dir}/tools/proguard/proguard-android.txt
7+
# You can edit the include path and order by changing the ProGuard
8+
# include property in project.properties.
9+
#
10+
# For more details, see
11+
# http://developer.android.com/guide/developing/tools/proguard.html
12+
13+
# Add any project specific keep options here:
14+
15+
# If your project uses WebView with JS, uncomment the following
16+
# and specify the fully qualified class name to the JavaScript interface
17+
# class:
18+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
19+
# public *;
20+
#}

0 commit comments

Comments
 (0)