Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix mediastreamer2 java sdk

Browse source
This commit is contained in:
Erwan Croze 2017-04-05 11:30:31 +02:00
parent 5329d7c6e1
commit 363d83d9a2
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
prepare.py
View file

@ -300,6 +300,32 @@ copy-libs:
\t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\ \t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\
\tfi \tfi
copy-libs-mediastreamer:
\trm -rf submodules/mediastreamer2/java/libs/armeabi
\tif test -d "liblinphone-sdk/android-arm"; then \\
\t\tmkdir -p submodules/mediastreamer2/java/libs/armeabi && \\
\t\tcp -f liblinphone-sdk/android-arm/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/armeabi && \\
\t\tsh WORK/android-arm/strip.sh submodules/mediastreamer2/java/libs/armeabi/*.so; \\
\tfi
\trm -rf submodules/mediastreamer2/java/libs/armeabi-v7a
\tif test -d "liblinphone-sdk/android-armv7"; then \\
\t\tmkdir -p submodules/mediastreamer2/java/libs/armeabi-v7a && \\
\t\tcp -f liblinphone-sdk/android-armv7/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/armeabi-v7a && \\
\t\tsh WORK/android-armv7/strip.sh submodules/mediastreamer2/java/libs/armeabi-v7a/*.so; \\
\tfi
\trm -rf submodules/mediastreamer2/java/libs/arm64-v8a
\tif test -d "liblinphone-sdk/android-arm64"; then \\
\t\tmkdir -p submodules/mediastreamer2/java/libs/arm64-v8a && \\
\t\tcp -f liblinphone-sdk/android-arm64/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/arm64-v8a && \\
\t\tsh WORK/android-arm64/strip.sh submodules/mediastreamer2/java/libs/arm64-v8a/*.so; \\
\tfi
\trm -rf submodules/mediastreamer2/java/libs/x86
\tif test -d "liblinphone-sdk/android-x86"; then \\
\t\tmkdir -p submodules/mediastreamer2/java/libs/x86 && \\
\t\tcp -f liblinphone-sdk/android-x86/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/x86 && \\
\t\tsh WORK/android-x86/strip.sh submodules/mediastreamer2/java/libs/x86/*.so; \\
\tfi
generate-apk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem generate-apk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem
\t./gradlew assembleDebug \t./gradlew assembleDebug
@ -328,7 +354,7 @@ linphone-android-sdk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem
\t./gradlew -b linphoneAndroidSdk.gradle assembleRelease \t./gradlew -b linphoneAndroidSdk.gradle assembleRelease
\t./gradlew -b linphoneAndroidSdk.gradle sdkZip \t./gradlew -b linphoneAndroidSdk.gradle sdkZip
mediastreamer2-sdk: build copy-libs mediastreamer2-sdk: build copy-libs-mediastreamer
\t@cd $(TOPDIR)/submodules/mediastreamer2/java && \\ \t@cd $(TOPDIR)/submodules/mediastreamer2/java && \\
\t./gradlew -b mediastreamerSdk.gradle assembleRelease \t./gradlew -b mediastreamerSdk.gradle assembleRelease
\t@cd $(TOPDIR)/submodules/mediastreamer2/java && \\ \t@cd $(TOPDIR)/submodules/mediastreamer2/java && \\

2
submodules/mediastreamer2

@ -1 +1 @@
Subproject commit d18d48a12dbe4560dba5ffbdb58d71b4f149e5ca Subproject commit bc087e2afedb0a62e314c6455c3dd465fb79cd86