From f369217000a89786369810a177e3404f103c4874 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Tue, 28 Feb 2012 11:45:25 -0800
Subject: Never add R/R$* classes to the library jar files.

Previous change added excluding Manifest and BuildConfig but
made it so that it was only for the current app package.

The problem is that project that depends on libraries also generates
R classes for their libraries.
If the project itself is a library then the R classes from the libraries
would get in the library jar output.

If the main project had some diamond dependencies in its libraries
then the same R class from a library could be added twice to its
dex input causing an error.

Change-Id: I0ef4a3c3f84bf9099de27e275fa856b6c044978d
---
 files/ant/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'files')

diff --git a/files/ant/build.xml b/files/ant/build.xml
index d68b56b..d1596eb 100644
--- a/files/ant/build.xml
+++ b/files/ant/build.xml
@@ -700,7 +700,7 @@
 
                     <jar destfile="${out.library.jar.file}">
                         <fileset dir="${out.classes.absolute.dir}"
-                                excludes="${manifest.package.path}/R.class ${manifest.package.path}/R$*.class ${manifest.package.path}/Manifest.class ${manifest.package.path}/Manifest$*.class ${manifest.package.path}/BuildConfig.class"/>
+                                excludes="**/R.class **/R$*.class ${manifest.package.path}/Manifest.class ${manifest.package.path}/Manifest$*.class ${manifest.package.path}/BuildConfig.class"/>
                         <fileset dir="${source.absolute.dir}" excludes="**/*.java ${android.package.excludes}" />
                     </jar>
                 </then>
-- 
cgit v1.1