Use MessageDigestFS into JackLibrary

- Update prebuilts with the last digest format.

Change-Id: Id064dc0f12777eb31126b05b14e1744f58bfd542

3 files changed, 18 insertions, 8 deletions

diff --git a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest009.java b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest009.java
index c9d9b1a..f09bb97 100644
--- a/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest009.java
+++ b/jack-tests/tests/com/android/jack/experimental/incremental/DependenciesTest009.java
@@ -29,7 +29,7 @@ import com.android.sched.util.file.Directory;
 import com.android.sched.util.file.FileOrDirectory.ChangePermission;
 import com.android.sched.util.file.FileOrDirectory.Existence;
 import com.android.sched.util.file.FileOrDirectory.Permission;
-import com.android.sched.vfs.DirectVFS;
+import com.android.sched.vfs.DirectFS;
 import com.android.sched.vfs.InputVFile;
 
 import junit.framework.Assert;
@@ -75,11 +75,11 @@ public class DependenciesTest009 {
 
     ite.incrementalBuildFromFolder();
 
-    DirectVFS directVFS = null;
+    DirectFS directFS = null;
     try {
-      directVFS = new DirectVFS(new Directory(ite.getCompilerStateFolder().getPath(), null,
-          Existence.MUST_EXIST, Permission.READ, ChangePermission.NOCHANGE));
-      InputJackLibrary inputJackLibrary = JackLibraryFactory.getInputLibrary(directVFS);
+      directFS = new DirectFS(new Directory(ite.getCompilerStateFolder().getPath(), null,
+          Existence.MUST_EXIST, Permission.READ, ChangePermission.NOCHANGE), Permission.READ);
+      InputJackLibrary inputJackLibrary = JackLibraryFactory.getInputLibrary(directFS);
 
       TypeDependencies typeDependencies = readTypeDependencies(inputJackLibrary);
 
@@ -96,8 +96,8 @@ public class DependenciesTest009 {
       assert dependencies1.equals(dependencies2);
       Assert.assertEquals(dependencies1, dependencies2);
     } finally {
-      if (directVFS != null) {
-        directVFS.close();
+      if (directFS != null) {
+        directFS.close();
       }
     }
   }
diff --git a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
index 9871251..bef3cf7 100644
--- a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
+++ b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
@@ -16,6 +16,8 @@
 
 package com.android.jack.fileconflict;
 
+import com.google.common.io.Files;
+
 import com.android.jack.backend.jayce.ImportConflictException;
 import com.android.jack.backend.jayce.JayceFileImporter;
 import com.android.jack.library.FileType;
@@ -279,12 +281,15 @@ public class FileConflictTests {
 
     String libPropName = JackLibrary.LIBRARY_PROPERTIES_VPATH.getPathAsString('/');
     File libProperties = new File(tempJackFolder, libPropName);
+    File digestFile = new File(tempJackFolder, FileType.DEX.getPrefix() + "/digest");
+
 
     // create Jack dirs to import
     File jackImport1 = AbstractTestTools.createTempDir();
     copyFileToDir(libProperties, libPropName, jackImport1);
     copyFileToDir(myClass1, jackFilePath, jackImport1);
     copyFileToDir(myClass1Dex, dexFilePath, jackImport1);
+    copyFileToDir(digestFile, FileType.DEX.getPrefix() + "/digest", jackImport1);
 
     // copy Jack file to output dir
     copyFileToDir(myClass1, jackFilePath, jackOutput);
@@ -418,10 +423,13 @@ public class FileConflictTests {
 
     String libPropName = JackLibrary.LIBRARY_PROPERTIES_VPATH.getPathAsString('/');
     File libProperties = new File(tempJackFolder, libPropName);
+    File digestFile = new File(tempJackFolder, FileType.DEX.getPrefix() + "/digest");
 
     // create Jack dirs to import
     File jackImport1 = AbstractTestTools.createTempDir();
     File jackImport2 = AbstractTestTools.createTempDir();
+    copyFileToDir(digestFile, FileType.DEX.getPrefix() + "/digest", jackImport1);
+    copyFileToDir(digestFile, FileType.DEX.getPrefix() + "/digest", jackImport2);
     copyFileToDir(libProperties, libPropName, jackImport1);
     copyFileToDir(myClass1, JACK_FILE_PATH_1, jackImport1);
     copyFileToDir(myClass1Dex, DEX_FILE_PATH_1, jackImport1);
diff --git a/jack-tests/tests/com/android/jack/library/LibraryTests.java b/jack-tests/tests/com/android/jack/library/LibraryTests.java
index eddf344..d518a66 100644
--- a/jack-tests/tests/com/android/jack/library/LibraryTests.java
+++ b/jack-tests/tests/com/android/jack/library/LibraryTests.java
@@ -25,6 +25,8 @@ import com.android.sched.util.file.FileOrDirectory.Existence;
 import com.android.sched.util.file.InputZipFile;
 import com.android.sched.vfs.InputVFS;
 import com.android.sched.vfs.InputZipVFS;
+import com.android.sched.vfs.ReadZipFS;
+import com.android.sched.vfs.VFS;
 
 import junit.framework.Assert;
 
@@ -86,7 +88,7 @@ public class LibraryTests {
         true, AbstractTestTools.getTestRootDir("com.android.jack.library.test001.jack"));
 
     RunnableHooks hooks = new RunnableHooks();
-    InputVFS vfs = new InputZipVFS(
+    VFS vfs = new ReadZipFS(
         new InputZipFile(out.getPath(), hooks, Existence.MUST_EXIST, ChangePermission.NOCHANGE));
     try {
       InputJackLibrary inputJackLibrary = JackLibraryFactory.getInputLibrary(vfs);