diff options
| author | Josiah Gaskin <josiahgaskin@google.com> | 2013-09-09 10:57:55 -0700 |
|---|---|---|
| committer | Josiah Gaskin <josiahgaskin@google.com> | 2013-09-09 11:01:13 -0700 |
| commit | 84bb14b54f1198aea077d68a8b11769374a6c29d (patch) | |
| tree | c7d39804aa652fc192dd7bd7cc25cadcdd83aea4 /eclipse/plugins | |
| parent | 59cd3677cd08f949360e732bb8c13e19ed87dc56 (diff) | |
| download | sdk-84bb14b54f1198aea077d68a8b11769374a6c29d.zip sdk-84bb14b54f1198aea077d68a8b11769374a6c29d.tar.gz sdk-84bb14b54f1198aea077d68a8b11769374a6c29d.tar.bz2 | |
ADT ignores new template dependencies
Prevents ADT from choking on new dependency declarations
in recipe files.
Change-Id: I70dd0d1502bffaf8fac26a1d90e1d66ff3046e0a
Diffstat (limited to 'eclipse/plugins')
2 files changed, 6 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/DexWrapper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/DexWrapper.java index 1c7c2e3..d6ad65b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/DexWrapper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/DexWrapper.java @@ -24,6 +24,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import java.io.File; +import java.io.IOException; import java.io.PrintStream; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -84,6 +85,7 @@ public final class DexWrapper { Class<?> consoleClass = loader.loadClass(DEX_CONSOLE); Class<?> argClass = loader.loadClass(DEX_ARGS); + loader.close(); try { // now get the fields/methods we need mRunMethod = mainClass.getMethod(MAIN_RUN, argClass); @@ -114,6 +116,9 @@ public final class DexWrapper { } catch (ClassNotFoundException e) { return createErrorStatus( String.format(Messages.DexWrapper_Failed_to_load_s, osFilepath), e); + } catch (IOException e) { + return createErrorStatus( + String.format(Messages.DexWrapper_Failed_to_load_s, osFilepath), e); } } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java index bd9c0fa..a875712 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java @@ -592,7 +592,7 @@ class TemplateHandler { if (relativePath != null && !relativePath.isEmpty()) { mOpen.add(relativePath); } - } else if (!name.equals("recipe")) { //$NON-NLS-1$ + } else if (!name.equals("recipe") && !name.equals(TAG_DEPENDENCY)) { //$NON-NLS-1$ System.err.println("WARNING: Unknown template directive " + name); } } catch (Exception e) { |