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

Fix build.xml

Browse source
This commit is contained in:
Guillaume Beraudo 2012-12-04 17:05:53 +01:00
parent ec71a1275e
commit 490e6a3d97
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
build.xml
View file

@ -549,6 +549,7 @@
libraryResFolderPathOut="project.library.res.folder.path" libraryResFolderPathOut="project.library.res.folder.path"
libraryBinAidlFolderPathOut="project.library.bin.aidl.folder.path" libraryBinAidlFolderPathOut="project.library.bin.aidl.folder.path"
libraryNativeFolderPathOut="project.library.native.folder.path" libraryNativeFolderPathOut="project.library.native.folder.path"
libraryRFilePathOut="project.library.bin.r.file.path"
jarLibraryPathOut="project.all.jars.path" jarLibraryPathOut="project.all.jars.path"
targetApi="${project.target.apilevel}" targetApi="${project.target.apilevel}"
verbose="${verbose}" /> verbose="${verbose}" />
@ -636,8 +637,8 @@
aidlOutFolder="${out.aidl.absolute.dir}"> aidlOutFolder="${out.aidl.absolute.dir}">
<source path="${source.absolute.dir}"/> <source path="${source.absolute.dir}"/>
</aidl> </aidl>
<path id="android.renderscript.include.path"> <path id="android.renderscript.include.path">
<pathelement location="${android.platform.tools.dir}/renderscript/include" /> <pathelement location="${android.platform.tools.dir}/renderscript/include" />
<pathelement location="${android.platform.tools.dir}/renderscript/clang-include" /> <pathelement location="${android.platform.tools.dir}/renderscript/clang-include" />
</path> </path>
@ -665,6 +666,7 @@
rfolder="${gen.absolute.dir}" rfolder="${gen.absolute.dir}"
nonConstantId="${android.library}" nonConstantId="${android.library}"
libraryResFolderPathRefid="project.library.res.folder.path" libraryResFolderPathRefid="project.library.res.folder.path"
libraryRFileRefid="project.library.bin.r.file.path"
libraryPackagesRefid="project.library.packages" libraryPackagesRefid="project.library.packages"
ignoreAssets="${aapt.ignore.assets}" ignoreAssets="${aapt.ignore.assets}"
proguardFile="${out.absolute.dir}/proguard.txt"> proguardFile="${out.absolute.dir}/proguard.txt">
@ -945,7 +947,7 @@
<arg value="--rename-manifest-package"/> <arg value="--rename-manifest-package"/>
<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>
@ -1052,14 +1054,10 @@
<fileset dir="submodules/linphone/java/common"> <fileset dir="submodules/linphone/java/common">
</fileset> </fileset>
</copy> </copy>
<copy includeemptydirs="false" todir="src/temp"> <copy includeemptydirs="false" todir="src/temp">
<fileset dir="submodules/linphone/java/impl">
</fileset>
</copy>
<!-- <copy includeemptydirs="false" todir="src/temp">
<fileset dir="submodules/linphone/coreapi/help/java"> <fileset dir="submodules/linphone/coreapi/help/java">
</fileset> </fileset>
</copy> --> </copy>
</target> </target>
<target name="delete-temp" description="remove linphone java files into right directories."> <target name="delete-temp" description="remove linphone java files into right directories.">
@ -1197,7 +1195,7 @@
<!-- This runs -package-release and -release-nosign first and then runs <!-- This runs -package-release and -release-nosign first and then runs
only if release-sign is true (set in -release-check, only if release-sign is true (set in -release-check,
called by -release-no-sign)--> called by -release-no-sign)-->
<target name="release" <target name="release"
depends="clean, init, -set-release-mode, -release-obfuscation-check, -package, -post-package, -release-prompt-for-password, -release-nosign, -release-sign, -post-build, delete-temp" depends="clean, init, -set-release-mode, -release-obfuscation-check, -package, -post-package, -release-prompt-for-password, -release-nosign, -release-sign, -post-build, delete-temp"
description="Builds the application in release mode."> description="Builds the application in release mode.">
</target> </target>
@ -1537,4 +1535,4 @@
<echo> device. Also uninstall tested package if applicable</echo> <echo> device. Also uninstall tested package if applicable</echo>
<echo> unless 'nodeps' is used as well.</echo> <echo> unless 'nodeps' is used as well.</echo>
</target> </target>
</project> </project>