diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-02-28 11:45:25 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-02-28 11:45:25 -0800 |
| commit | f369217000a89786369810a177e3404f103c4874 (patch) | |
| tree | 8a8c1e5ee1dc4b4b9403061c6e1accc7d2328074 /files | |
| parent | 0a5104e923c10167af41c5f2b644a49116294cea (diff) | |
| download | sdk-f369217000a89786369810a177e3404f103c4874.zip sdk-f369217000a89786369810a177e3404f103c4874.tar.gz sdk-f369217000a89786369810a177e3404f103c4874.tar.bz2 | |
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
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/build.xml | 2 |
1 files changed, 1 insertions, 1 deletions
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> |