Remove intermediate dex dir

- Jack always uses library as temporary output for intermediate dex.
- Incremental uses library to keep incremental data between compilation.

Bug: 18425643

Change-Id: Ibbf9aab41c583e11e3e7c5c7a8be61f12dd617b9

1 files changed, 5 insertions, 4 deletions

diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java
index d6f0ae2..e316e39 100644
--- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java
+++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java
@@ -66,7 +66,7 @@ public class DependenciesTest015 {
     iteProg.addJavaFile("jack.incremental", "B.java", "package jack.incremental; \n"
         + "public class B extends A { \n" + " @Override public void m(){} }");
 
-    iteProg.incrementalBuildFromFolder(new File[]{iteLib.getJackFolder()});
+    iteProg.incrementalBuildFromFolder(new File[]{iteLib.getCompilerStateFolder()});
     iteProg.snapshotJackFilesModificationDate();
     Assert.assertEquals(1, iteProg.getJackFiles().size());
 
@@ -81,7 +81,7 @@ public class DependenciesTest015 {
     ByteArrayOutputStream err = new ByteArrayOutputStream();
     iteProg.setErr(err);
     try {
-      iteProg.incrementalBuildFromFolder(new File[] {iteLib.getJackFolder()});
+      iteProg.incrementalBuildFromFolder(new File[] {iteLib.getCompilerStateFolder()});
       Assert.fail();
     } catch (FrontendCompilationException e) {
       Assert.assertTrue(err.toString().contains(
@@ -112,7 +112,8 @@ public class DependenciesTest015 {
     iteProg.addJavaFile("jack.incremental", "B.java", "package jack.incremental; \n"
         + "public class B { \n" + " public void m(){} }");
 
-    iteProg.incrementalBuildFromFolder(null /*classpath*/, Arrays.asList(iteLib.getJackFolder()));
+    iteProg.incrementalBuildFromFolder(null /* classpath */,
+        Arrays.asList(iteLib.getCompilerStateFolder()));
     iteProg.snapshotJackFilesModificationDate();
     Assert.assertEquals(2, iteProg.getJackFiles().size());
 
@@ -128,7 +129,7 @@ public class DependenciesTest015 {
     Assert.assertEquals(2, jackFilesLib.size());
 
 
-    iteProg.incrementalBuildFromFolder(null, Arrays.asList(iteLib.getJackFolder()));
+    iteProg.incrementalBuildFromFolder(null, Arrays.asList(iteLib.getCompilerStateFolder()));
     iteProg.snapshotJackFilesModificationDate();
     Assert.assertEquals(3, iteProg.getJackFiles().size());