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

Fix liblinphone and linphone tester

Browse source
This commit is contained in:
Erwan Croze 2017-02-23 11:04:48 +01:00
parent f7378dac54
commit 1de819e33a
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
custom_rules.xml
View file

@ -73,7 +73,7 @@
<echo level="info">Creating library output jar file...</echo> <echo level="info">Creating library output jar file...</echo>
<property name="out.library.jar.file" location="${out.absolute.dir}/liblinphone.jar" /> <property name="out.library.jar.file" location="${out.absolute.dir}/liblinphone.jar" />
<jar destfile="${out.library.jar.file}"> <jar destfile="${out.library.jar.file}">
<fileset dir="${out.classes.absolute.dir}" <fileset dir="bin/intermediates/classes/debug"
includes="org/linphone/mediastream/**/*.class org/linphone/core/**/*.class org/linphone/tools/**/*.class"/> includes="org/linphone/mediastream/**/*.class org/linphone/core/**/*.class org/linphone/tools/**/*.class"/>
<fileset dir="submodules/linphone/java" > <fileset dir="submodules/linphone/java" >
<include name="common/org/linphone/core/*.java"/> <include name="common/org/linphone/core/*.java"/>

2
default.properties
View file

@ -1 +1 @@
version.name="" version.name=3.2.2-97-gf7378dac

5
prepare.py
View file

@ -216,6 +216,9 @@ install: install-apk run-linphone
java-clean: java-clean:
\tgradle clean \tgradle clean
ant-clean:
\tant clean
$(TOPDIR)/res/raw/rootca.pem: $(TOPDIR)/res/raw/rootca.pem:
\tcp liblinphone-sdk/android-{first_arch}/share/linphone/rootca.pem $@ \tcp liblinphone-sdk/android-{first_arch}/share/linphone/rootca.pem $@
@ -309,7 +312,7 @@ generate-apk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem update-pro
\techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\ \techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\
\tgradle assembleDebug \tgradle assembleDebug
generate-mediastreamer2-apk: java-clean build copy-libs update-mediastreamer2-project generate-mediastreamer2-apk: ant-clean build copy-libs update-mediastreamer2-project
\t@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \\ \t@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \\
\techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\ \techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\
\tant debug \tant debug