summaryrefslogtreecommitdiffstats
path: root/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-09-26 15:30:50 -0700
committerXavier Ducrohet <xav@android.com>2012-09-26 15:30:50 -0700
commitec6247773d387142cccd941d89fa8ebbeb496e81 (patch)
tree48f5f2a1837c8fb29e96513f6ee11518744f0cd8 /eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders
parent3c72b29d1ea0c47d97d579b5e85b8205034f9f61 (diff)
downloaddevice_generic_opengl-transport-ec6247773d387142cccd941d89fa8ebbeb496e81.tar.gz
device_generic_opengl-transport-ec6247773d387142cccd941d89fa8ebbeb496e81.tar.bz2
device_generic_opengl-transport-ec6247773d387142cccd941d89fa8ebbeb496e81.zip
Never generate R class for libraries inside libraries.
Bad ADT, bad! Change-Id: Id1e0ee1c0001faf16b5551674d037f009222015b
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders')
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java3
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 1507a8d5f..a55e840b9 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();