Merge "Add getLastModified() to VFile" into ub-jack-brest

2 files changed, 13 insertions, 8 deletions

diff --git a/jack/src/com/android/jack/incremental/IncrementalInputFilter.java b/jack/src/com/android/jack/incremental/IncrementalInputFilter.java
index f925926..887abcb 100644
--- a/jack/src/com/android/jack/incremental/IncrementalInputFilter.java
+++ b/jack/src/com/android/jack/incremental/IncrementalInputFilter.java
@@ -382,13 +382,19 @@ public class IncrementalInputFilter extends CommonFilter implements InputFilter
   @Nonnull
   private void fillModifiedFileNames(@Nonnull Set<String> modifiedFileNames) {
     assert fileDependencies != null;
+    assert incrementalInputLibrary != null;
 
     for (String javaFileName : fileDependencies.getCompiledJavaFiles()) {
       if (fileNamesOnCmdLine.contains(javaFileName)) {
         File javaFile = new File(javaFileName);
         for (String typeName : fileDependencies.getTypeNames(javaFileName)) {
-          File dexFile = getDexFile(typeName);
-          if (!dexFile.exists() || ((javaFile.lastModified() > dexFile.lastModified()))) {
+          InputVFile dexFile;
+          try {
+            dexFile = incrementalInputLibrary.getFile(FileType.DEX, new VPath(typeName, '/'));
+          } catch (FileTypeDoesNotExistException e) {
+            dexFile = null;
+          }
+          if (dexFile == null || ((javaFile.lastModified() > dexFile.getLastModified()))) {
             modifiedFileNames.add(javaFileName);
           }
         }
@@ -413,12 +419,6 @@ public class IncrementalInputFilter extends CommonFilter implements InputFilter
   }
 
   @Nonnull
-  private File getDexFile(@Nonnull String typeName) {
-    return new File(incrementalFolder, FileType.DEX.buildFileVPath(
-        new VPath(typeName, '/')).getPathAsString(File.separatorChar));
-  }
-
-  @Nonnull
   private void fillDependencies(@Nonnull InputJackLibrary library, @Nonnull VPath dependencyVPath,
       @Nonnull Dependency dependency)
       throws CannotReadException, FileTypeDoesNotExistException {
diff --git a/jack/src/com/android/jack/shrob/obfuscation/resource/RefinedVFile.java b/jack/src/com/android/jack/shrob/obfuscation/resource/RefinedVFile.java
index b8d81b5..dd2e2d5 100644
--- a/jack/src/com/android/jack/shrob/obfuscation/resource/RefinedVFile.java
+++ b/jack/src/com/android/jack/shrob/obfuscation/resource/RefinedVFile.java
@@ -284,4 +284,9 @@ public class RefinedVFile extends AbstractVElement implements InputVFile {
   public VPath getPathFromRoot() {
     return file.getPathFromRoot();
   }
+
+  @Override
+  public long getLastModified() {
+    return file.getLastModified();
+  }
 }