summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marie Henaff <jmhenaff@google.com>2015-03-19 13:30:08 +0100
committerJean-Marie Henaff <jmhenaff@google.com>2015-06-18 10:33:46 +0200
commit541b8412e29facfec22fb7fa8cae1968e1441ad8 (patch)
tree3426cd105649f28dcdbb23061e51c76c0b8a090a
parenta934fc4e32baa10238cc94c59eb5171be8624643 (diff)
downloadtoolchain_jack-541b8412e29facfec22fb7fa8cae1968e1441ad8.zip
toolchain_jack-541b8412e29facfec22fb7fa8cae1968e1441ad8.tar.gz
toolchain_jack-541b8412e29facfec22fb7fa8cae1968e1441ad8.tar.bz2
Fix missing tmp dir deletion
Share the same runnable hooks between Jack checks and Jack run in Jack api implementation. Otherwise tmpdir created during checks are not deleted. Bug: 20523457 (cherry picked from commit 0a258f00c03b5bae823b38ef3a541da6bb1b5381) Change-Id: I8dd72d52801779ae59f70cd1725057152b59bdea
-rw-r--r--jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java b/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java
index 3d96cc7..94a570f 100644
--- a/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java
+++ b/jack/src/com/android/jack/api/v01/impl/Api01ConfigImpl.java
@@ -76,23 +76,26 @@ public class Api01ConfigImpl implements Api01Config {
throw new ConfigurationException(e.getMessage(), e);
}
- return new Api01CompilationTaskImpl(options);
+ return new Api01CompilationTaskImpl(options, configHooks);
}
private static class Api01CompilationTaskImpl implements Api01CompilationTask {
@Nonnull
private final Options options;
+ @Nonnull
+ private final RunnableHooks runSessionHooks;
- public Api01CompilationTaskImpl(@Nonnull Options options) {
+ public Api01CompilationTaskImpl(@Nonnull Options options,
+ @Nonnull RunnableHooks runSessionHooks) {
this.options = options;
+ this.runSessionHooks = runSessionHooks;
}
@Override
public void run() throws CompilationException, UnrecoverableException {
ProcessException pe = null;
- RunnableHooks runSessionHooks = new RunnableHooks();
try {
try {
Jack.run(options, runSessionHooks);