diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-09-20 19:45:43 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-09-20 19:45:43 -0700 |
| commit | bbfb29424d981151074107221fa728a5ffc47123 (patch) | |
| tree | 4bed8e336ab5b91c500e3a43b927f2a48d7b0cb7 /files | |
| parent | 1d96433fc413046aeecc8bd9388fecad511ecefb (diff) | |
| download | sdk-bbfb29424d981151074107221fa728a5ffc47123.zip sdk-bbfb29424d981151074107221fa728a5ffc47123.tar.gz sdk-bbfb29424d981151074107221fa728a5ffc47123.tar.bz2 | |
Fix new R class generation for libraries
- only generate the R class of libraries when the project is not a lib
- package the manifest classes of libraries since we only do
delayed generation of the R class now.
Change-Id: I54908984651dab73b3496145120e2ee7cf9c6c9a
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 a1e9daa..4861c1d 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -758,7 +758,7 @@ <jar destfile="${out.library.jar.file}"> <fileset dir="${out.classes.absolute.dir}" includes="**/*.class" - excludes="${project.app.package.path}/R.class ${project.app.package.path}/R$*.class ${project.app.package.path}/Manifest.class ${project.app.package.path}/Manifest$*.class ${project.app.package.path}/BuildConfig.class"/> + excludes="${project.app.package.path}/R.class ${project.app.package.path}/R$*.class ${project.app.package.path}/BuildConfig.class"/> <fileset dir="${source.absolute.dir}" excludes="**/*.java ${android.package.excludes}" /> </jar> </then> |