diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-09-26 15:41:54 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-09-26 15:41:54 -0700 |
| commit | 3c5badce945d4c2af761e1877af197beefe0443c (patch) | |
| tree | c399f05be2184f6afad9fe5007c2685f398bcd91 | |
| parent | dcf8f06b4b25e8de6dbc1a1a7b3bc96d7c66d37f (diff) | |
| parent | ec6247773d387142cccd941d89fa8ebbeb496e81 (diff) | |
| download | sdk-3c5badce945d4c2af761e1877af197beefe0443c.zip sdk-3c5badce945d4c2af761e1877af197beefe0443c.tar.gz sdk-3c5badce945d4c2af761e1877af197beefe0443c.tar.bz2 | |
Merge "Never generate R class for libraries inside libraries."
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 1507a8d..a55e840 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 @@ -1109,7 +1109,8 @@ public class PreCompilerBuilder extends BaseBuilder { } // now if the project has libraries, R needs to be created for each libraries - if (!libRFiles.isEmpty()) { + // unless this is a library. + if (isLibrary == false && !libRFiles.isEmpty()) { SymbolLoader symbolValues = new SymbolLoader(new File(outputFolder, "R.txt")); symbolValues.load(); |