From 490e6a3d977ab4201dc98f712dd61aeef0ce6f8d Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@linphone.org>
Date: Tue, 4 Dec 2012 17:05:53 +0100
Subject: [PATCH] Fix build.xml

---
 build.xml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index 7a656c56d..d87c5fd4d 100644
--- a/build.xml
+++ b/build.xml
@@ -549,6 +549,7 @@
                 libraryResFolderPathOut="project.library.res.folder.path"
                 libraryBinAidlFolderPathOut="project.library.bin.aidl.folder.path"
                 libraryNativeFolderPathOut="project.library.native.folder.path"
+                libraryRFilePathOut="project.library.bin.r.file.path"
                 jarLibraryPathOut="project.all.jars.path"
                 targetApi="${project.target.apilevel}"
                 verbose="${verbose}" />
@@ -636,8 +637,8 @@
                     aidlOutFolder="${out.aidl.absolute.dir}">
                 <source path="${source.absolute.dir}"/>
             </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/clang-include" />
 			</path>
@@ -665,6 +666,7 @@
                     rfolder="${gen.absolute.dir}"
                     nonConstantId="${android.library}"
                     libraryResFolderPathRefid="project.library.res.folder.path"
+                    libraryRFileRefid="project.library.bin.r.file.path"
                     libraryPackagesRefid="project.library.packages"
                     ignoreAssets="${aapt.ignore.assets}"
                     proguardFile="${out.absolute.dir}/proguard.txt">
@@ -945,7 +947,7 @@
 			  <arg value="--rename-manifest-package"/> 
 			  <arg value="${linphone.package.name}"/> 
 			  <arg value="--custom-package" />
-			  <arg value="${linphone.package.name}"/> 
+			  <arg value="${linphone.package.name}"/>
 			</exec> 
         </do-only-if-not-library>
     </target>
@@ -1052,14 +1054,10 @@
             <fileset dir="submodules/linphone/java/common">
             </fileset>
         </copy>
-		<copy includeemptydirs="false" todir="src/temp">
-            <fileset dir="submodules/linphone/java/impl">
-            </fileset>
-        </copy>
-        <!-- <copy includeemptydirs="false" todir="src/temp">
+        <copy includeemptydirs="false" todir="src/temp">
             <fileset dir="submodules/linphone/coreapi/help/java">
             </fileset>
-        </copy> -->
+        </copy>
     </target>
 
     <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
          only if release-sign is true (set in -release-check,
          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"
                 description="Builds the application in release mode.">
     </target>
@@ -1537,4 +1535,4 @@
         <echo>              device. Also uninstall tested package if applicable</echo>
         <echo>              unless 'nodeps' is used as well.</echo>
     </target>
-</project>
+</project>
\ No newline at end of file