Merge "Only generate the libraries R/manifest classes in the app project."

2 files changed, 6 insertions, 7 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java
index cdee0aa..6c4eca4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java
@@ -813,13 +813,11 @@ public class PostCompilerBuilder extends BaseBuilder {
                     rootFolder.getFullPath());
 
             String name = file.getName();
-            // we don't package any R[$*] classes whatever the package (because we generate
-            // more than one if there are library dependencies). Also ignore Manifest and
-            // BuildConfig classes that are in the app package.
-            if (R_PATTERN.matcher(name).matches() ||
-                    (mAppPackage.equals(packageApp.toString()) &&
+            // Ignore the library's R/Manifest/BuildConfig classes.
+            if (mAppPackage.equals(packageApp.toString()) &&
                             (BUILD_CONFIG_CLASS.equals(name) ||
-                            MANIFEST_PATTERN.matcher(name).matches()))) {
+                            MANIFEST_PATTERN.matcher(name).matches() ||
+                            R_PATTERN.matcher(name).matches())) {
                 return;
             }
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
index 7713f47..8234f25 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
@@ -805,7 +805,8 @@ public class PreCompilerBuilder extends BaseBuilder {
             array.add("--auto-add-overlay"); //$NON-NLS-1$
         }
 
-        if (libraryPackages != null) {
+        // there's no need to generate the R class of the libraries if this is a library too.
+        if (isLibrary == false && libraryPackages != null) {
             array.add("--extra-packages"); //$NON-NLS-1$
             array.add(libraryPackages);
         }