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

2 files changed, 3 insertions, 2 deletions

diff --git a/anttasks/src/com/android/ant/AaptExecTask.java b/anttasks/src/com/android/ant/AaptExecTask.java
index 5fd57b8..c82f0d6 100644
--- a/anttasks/src/com/android/ant/AaptExecTask.java
+++ b/anttasks/src/com/android/ant/AaptExecTask.java
@@ -675,8 +675,9 @@ public final class AaptExecTask extends SingleDependencyTask {
         task.execute();
 
         // now if the project has libraries, R needs to be created for each libraries
+        // but only if the project is not a library.
         try {
-            if (libPkgProp != null && !libPkgProp.isEmpty()) {
+            if (!mNonConstantId && libPkgProp != null && !libPkgProp.isEmpty()) {
                 SymbolLoader symbolValues = new SymbolLoader(new File(mBinFolder, "R.txt"));
                 symbolValues.load();
 
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>