Skip to content

Commit bb590b6

Browse files
libmediaのaarをアップロード。
1 parent 168da0e commit bb590b6

3 files changed

Lines changed: 22 additions & 5 deletions

File tree

dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ dependencies {
105105
implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:1.9.7'
106106
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.6'
107107
implementation 'org.deviceconnect:dconnect-demo-lib:1.0.1'
108-
implementation 'org.deviceconnect:libmedia:1.3.0'
109-
implementation 'org.deviceconnect:libsrt:1.3.0'
108+
implementation 'org.deviceconnect:libmedia:1.4.0'
109+
implementation 'org.deviceconnect:libsrt:1.4.0'
110110
// implementation project(':libmedia')
111111
// implementation project(':libsrt')
112112
}

dConnectSDK/dConnectLibStreaming/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

dConnectSDK/dConnectLibStreaming/libsrt/build.gradle

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if (githubPropertiesFile.exists()) {
66
githubProperties.load(new FileInputStream(githubPropertiesFile))
77
}
88
def getVersionName = { ->
9-
return "1.3.0" // Replace with version Name
9+
return "1.4.0" // Replace with version Name
1010
}
1111

1212
def getArtificatId = { ->
@@ -35,6 +35,23 @@ android {
3535
ndk {
3636
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
3737
}
38+
packagingOptions {
39+
pickFirst 'lib/armeabi-v7a/libsrt.so'
40+
pickFirst 'lib/x86_64/libsrt.so'
41+
pickFirst 'lib/x86/libsrt.so'
42+
pickFirst 'lib/arm64-v8a/libsrt.so'
43+
pickFirst 'lib/armeabi-v7a/libc++_shared.so'
44+
pickFirst 'lib/x86_64/libsrt-native-interface.so'
45+
pickFirst 'lib/arm64-v8a/libc++_shared.so'
46+
pickFirst 'lib/x86_64/libc++_shared.so'
47+
pickFirst 'lib/armeabi-v7a/libsrt-native-interface.so'
48+
pickFirst 'lib/x86/libc++_shared.so'
49+
pickFirst 'lib/arm64-v8a/libsrt-native-interface.so'
50+
pickFirst 'lib/x86/libsrt-native-interface.so'
51+
pickFirst 'lib/armeabi-v7a/libnative-lib.so'
52+
pickFirst 'lib/arm64-v8a/libnative-lib.so'
53+
pickFirst 'lib/x86/libnative-lib.so'
54+
}
3855
}
3956

4057
buildTypes {
@@ -93,7 +110,7 @@ android {
93110

94111
dependencies {
95112
implementation fileTree(dir: 'libs', include: ['*.jar'])
96-
implementation 'org.deviceconnect:libmedia:1.3.0'
113+
implementation 'org.deviceconnect:libmedia:1.4.0'
97114
// implementation project(':libmedia')
98115

99116
testImplementation 'junit:junit:4.13.2'

0 commit comments

Comments
 (0)