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

4
custom_rules.xml
View file

@ -4,7 +4,7 @@
<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"
@ -12,7 +12,7 @@
</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>

2
submodules/linphone

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