diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-09-28 16:05:46 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-09-28 16:05:47 -0700 |
| commit | 47e70507cd7dd7e2f77ab7db252a0db131203a4e (patch) | |
| tree | 6fb2982a35a1a9a0bd4457d27f00b4857f1ed7e1 /eclipse | |
| parent | c439a89ccdcf7123f52cb528d57d5ef78881e0da (diff) | |
| parent | 2b426ae27c0be8ebd26bc69ad59007e45487568b (diff) | |
| download | sdk-47e70507cd7dd7e2f77ab7db252a0db131203a4e.zip sdk-47e70507cd7dd7e2f77ab7db252a0db131203a4e.tar.gz sdk-47e70507cd7dd7e2f77ab7db252a0db131203a4e.tar.bz2 | |
Merge "ManifestMerger: ability to inject attributes."
Diffstat (limited to 'eclipse')
| -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 bd4dd4a..5183658 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 @@ -881,7 +881,8 @@ public class PreCompilerBuilder extends BaseBuilder { if (merger.process( outFile.getLocation().toFile(), manifest.getLocation().toFile(), - libManifests) == false) { + libManifests, + null /*injectAttributes*/) == false) { if (errors.size() > 1) { StringBuilder sb = new StringBuilder(); for (String s : errors) { |