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

Reworked SDK ant/Makefile targets

Browse source
This commit is contained in:
Sylvain Berfini 2014-07-24 14:12:48 +02:00
parent d7db1b111c
commit 4879a1a941
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -543,12 +543,13 @@ veryclean: clean clean-ffmpeg clean-x264 clean-openh264 clean-vpx
.PHONY: clean install-apk run-linphone .PHONY: clean install-apk run-linphone
generate-sdk: generate-apk generate-sdk: generate-apk
ant liblinphone-sdk ant liblinphone-android-sdk
linphone-sdk: generate-sdk liblinphone-android-sdk: generate-apk
ant liblinphone-android-sdk
linphone-android-sdk: generate-apk linphone-android-sdk: generate-apk
ant liblinphone-android-sdk ant linphone-android-sdk
mediastreamer2-sdk: update-mediastreamer2-project generate-mediastreamer2-apk mediastreamer2-sdk: update-mediastreamer2-project generate-mediastreamer2-apk
@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \ @cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \

12
custom_rules.xml
View file

@ -121,7 +121,7 @@
</exec> </exec>
</target> </target>
<target name="liblinphone-sdk"> <target name="liblinphone-android-sdk">
<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}">
@ -132,15 +132,15 @@
<include name="j2se/org/linphone/core/*.java"/> <include name="j2se/org/linphone/core/*.java"/>
</fileset> </fileset>
</jar> </jar>
<zip destfile="liblinphone-sdk-${version.name}.zip"> <zip destfile="liblinphone-android-sdk-${version.name}.zip">
<zipfileset dir="libs" prefix="libs" includes="**/*.so" /> <zipfileset dir="libs" prefix="libs" includes="**/*.so" />
<zipfileset dir="${out.absolute.dir}" includes="liblinphone.jar" prefix="libs"/> <zipfileset dir="${out.absolute.dir}" includes="liblinphone.jar" prefix="libs"/>
</zip> </zip>
</target> </target>
<target name="liblinphone-android-sdk"> <target name="linphone-android-sdk">
<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-android.jar" /> <property name="out.library.jar.file" location="${out.absolute.dir}/linphone.jar" />
<jar destfile="${out.library.jar.file}"> <jar destfile="${out.library.jar.file}">
<fileset dir="${out.classes.absolute.dir}" <fileset dir="${out.classes.absolute.dir}"
includes="org/linphone/mediastream/**/*.class org/linphone/core/**/*.class org/linphone/**/*.class"/> includes="org/linphone/mediastream/**/*.class org/linphone/core/**/*.class org/linphone/**/*.class"/>
@ -149,6 +149,10 @@
<include name="j2se/org/linphone/core/*.java"/> <include name="j2se/org/linphone/core/*.java"/>
</fileset> </fileset>
</jar> </jar>
<zip destfile="linphone-android-sdk-${version.name}.zip">
<zipfileset dir="libs" prefix="libs" includes="**/*.so" />
<zipfileset dir="${out.absolute.dir}" includes="linphone.jar" prefix="libs"/>
</zip>
</target> </target>
</project> </project>