Now merger use pre-dex directly from imported libraries

- Add a property jack.incremental to know if incremental mode
is enable or not.
- Do not move pre-dex and Jayce files of imported libraries
into the library representing the incremental state.

Change-Id: I92597d1c1958dd3caf219bf4a8dfde3097e26f92

1 files changed, 2 insertions, 2 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 3313763..3558c0d 100644
--- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java
+++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest015.java
@@ -115,7 +115,7 @@ public class DependenciesTest015 {
     iteProg.incrementalBuildFromFolder(null /* classpath */,
         Arrays.asList(iteLib.getCompilerStateFolder()));
     iteProg.snapshotJackFilesModificationDate();
-    Assert.assertEquals(2, iteProg.getJackFiles().size());
+    Assert.assertEquals(1, iteProg.getJackFiles().size());
 
     DexBuffer db = new DexBuffer(new FileInputStream(iteProg.getDexFile()));
     Assert.assertTrue(db.typeNames().contains("Ljack/incremental/A;"));
@@ -131,7 +131,7 @@ public class DependenciesTest015 {
 
     iteProg.incrementalBuildFromFolder(null, Arrays.asList(iteLib.getCompilerStateFolder()));
     iteProg.snapshotJackFilesModificationDate();
-    Assert.assertEquals(3, iteProg.getJackFiles().size());
+    Assert.assertEquals(1, iteProg.getJackFiles().size());
 
     db = new DexBuffer(new FileInputStream(iteProg.getDexFile()));
     Assert.assertTrue(db.typeNames().contains("Ljack/incremental/A;"));