From dadec7e60b8af426fa97c13a80892fa2d3ba2899 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@belledonne-communications.com>
Date: Mon, 2 Jan 2012 16:49:23 +0100
Subject: [PATCH] build.xml updated to take in charge R.java package name

---
 build.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 271c019b3..e77878e4d 100644
--- a/build.xml
+++ b/build.xml
@@ -102,6 +102,8 @@
         - help target
     -->
 
+    <property name="linphone.package.name" value="org.linphone" />
+
     <!-- ********** Overrideable Properties ********** -->
 
     <!-- You can override these values in your build.xml or build.properties.
@@ -129,7 +131,7 @@
     <property name="java.source" value="1.5" />
 
     <!-- Verbosity -->
-    <property name="verbose" value="false" />
+    <property name="verbose" value="true" />
 
     <!-- ********** Custom Tasks ********** -->
 
@@ -644,7 +646,7 @@
                     rfolder="${gen.absolute.dir}"
                     nonConstantId="${android.library}"
                     projectLibrariesResName="project.libraries.res"
-                    projectLibrariesPackageName="project.libraries.package">
+                    projectLibrariesPackageName="${linphone.package.name}">
                 <res path="${resource.absolute.dir}" />
             </aapt>
         </do-only-if-manifest-hasCode>
@@ -859,7 +861,7 @@
                     resourcefilename="${resource.package.file.name}"
                     resourcefilter="${aapt.resource.filter}"
                     projectLibrariesResName="project.libraries.res"
-                    projectLibrariesPackageName="project.libraries.package"
+                    projectLibrariesPackageName="${linphone.package.name}"
                     previousBuildType="${build.last.target}"
                     buildType="${build.target}">
                 <res path="${out.res.absolute.dir}" />