diff options
author | Benoit Lamarche <benoitlamarche@google.com> | 2015-05-26 17:07:58 +0200 |
---|---|---|
committer | Benoit Lamarche <benoitlamarche@google.com> | 2015-05-29 12:03:08 +0200 |
commit | edfcedaf3de656690374ae7c56e74235d406298b (patch) | |
tree | cbf964892836659fa4d96275bcef722291411140 /jack/tests | |
parent | 074951b98dc7203f62ae76e894a19af38ed65725 (diff) | |
download | toolchain_jack-edfcedaf3de656690374ae7c56e74235d406298b.tar.gz toolchain_jack-edfcedaf3de656690374ae7c56e74235d406298b.tar.bz2 toolchain_jack-edfcedaf3de656690374ae7c56e74235d406298b.zip |
Always close the Jack output library
This change is required to make sure the Jack output library is
closed, even when buildSession fails. It also makes sure that there
is only one Jack output library instance.
(cherry picked from commit 209c4fd6b447acceb73987f7df16c5bfbdf1ba0f)
Change-Id: I16ed98ed34f6864ac518cac26d4157a35ae30e56
Diffstat (limited to 'jack/tests')
-rw-r--r-- | jack/tests/com/android/jack/frontend/OrderedInputFilter.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/jack/tests/com/android/jack/frontend/OrderedInputFilter.java b/jack/tests/com/android/jack/frontend/OrderedInputFilter.java index 5d1be700..9b3ee59c 100644 --- a/jack/tests/com/android/jack/frontend/OrderedInputFilter.java +++ b/jack/tests/com/android/jack/frontend/OrderedInputFilter.java @@ -56,6 +56,9 @@ public class OrderedInputFilter extends CommonFilter implements InputFilter { @Nonnull private final List<? extends InputLibrary> librariesOnClasspathFromCommandLine; + @Nonnull + private final OutputJackLibrary outputJackLibrary; + public OrderedInputFilter(@Nonnull Options options) { this.options = options; this.fileNamesToCompile = getJavaFileNamesSpecifiedOnCommandLine(options); @@ -70,6 +73,8 @@ public class OrderedInputFilter extends CommonFilter implements InputFilter { LibraryDependencies libraryDependencies = session.getLibraryDependencies(); libraryDependencies.addImportedLibraries(importedLibrariesFromCommandLine); libraryDependencies.addLibrariesOnClasspath(librariesOnClasspathFromCommandLine); + + outputJackLibrary = getOutputJackLibraryFromVfs(); } @Override @@ -93,7 +98,7 @@ public class OrderedInputFilter extends CommonFilter implements InputFilter { @Override @Nonnull public OutputJackLibrary getOutputJackLibrary() { - return getOutputJackLibraryFromVfs(); + return outputJackLibrary; } @Override |