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

Fix android compilation

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2014-11-21 16:02:20 +01:00
parent 6ba0bc6f68
commit d0190d8656
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
custom_rules.xml
View file

@ -4,15 +4,15 @@
<target name="-pre-build" description="Move file that is not to be compiled."> <target name="-pre-build" description="Move file that is not to be compiled.">
<move file="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java" <move file="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java"
tofile="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.wnin" tofile="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java.ignored"
failonerror="false" /> failonerror="false" />
<copy file="submodules/linphone/share/xml/lpconfig.xsd" <copy file="submodules/linphone/share/xml/lpconfig.xsd"
tofile="res/raw/lpconfig.xsd" tofile="res/raw/lpconfig.xsd"
failonerror="false" /> failonerror="false" />
</target> </target>
<target name="-post-build" description="Restore file that has been moved so that it was not compiled."> <target name="-post-build" description="Restore file that has been moved so that it was not compiled.">
<move file="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.wnin" <move file="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java.ignored"
tofile="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java" tofile="submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/MediastreamerActivity.java"
failonerror="false" /> failonerror="false" />
</target> </target>
@ -59,17 +59,17 @@
<class name="org.linphone.tools.Lpc2Xml" /> <class name="org.linphone.tools.Lpc2Xml" />
</javah> </javah>
</target> </target>
<target name="partial-clean"> <target name="partial-clean">
<delete file="bin/${ant.project.name}.ap_" /> <delete file="bin/${ant.project.name}.ap_" />
</target> </target>
<target name="javadoc"> <target name="javadoc">
<echo level="info">Generate Javadoc</echo> <echo level="info">Generate Javadoc</echo>
<javadoc <javadoc
destdir="${javadoc.dir}" destdir="${javadoc.dir}"
verbose="off" verbose="off"
use="true" use="true"
classpath="${sdk.dir}/platforms/${target}/android.jar:libs/android-support-v4.jar:libs/gcm.jar" classpath="${sdk.dir}/platforms/${target}/android.jar:libs/android-support-v4.jar:libs/gcm.jar"
sourcepath="${source.dir}:gen" sourcepath="${source.dir}:gen"
linkoffline="http://developer.android.com/reference file:/${sdk.dir}/docs/reference" linkoffline="http://developer.android.com/reference file:/${sdk.dir}/docs/reference"
@ -77,7 +77,7 @@
</javadoc> </javadoc>
</target> </target>
<target name="-package-resources" depends="-crunch"> <target name="-package-resources" depends="-crunch">
<!-- only package resources if *not* a library project --> <!-- only package resources if *not* a library project -->
<do-only-if-not-library elseText="Library project: do not package resources..."> <do-only-if-not-library elseText="Library project: do not package resources...">
<exec executable="${aapt}" failonerror="true"> <exec executable="${aapt}" failonerror="true">
@ -105,7 +105,7 @@
<arg value="${linphone.package.name}" /> <arg value="${linphone.package.name}" />
<arg value="--custom-package" /> <arg value="--custom-package" />
<arg value="${linphone.package.name}" /> <arg value="${linphone.package.name}" />
</exec> </exec>
</do-only-if-not-library> </do-only-if-not-library>
</target> </target>

2
submodules/linphone

@ -1 +1 @@
Subproject commit 8846ca4780ace20a0452a18b5a0e7c2e24fc669d Subproject commit 3149d5b69291c58811592ae8072446aa63fa588a