Add new VFile delete API

And remove VDir delete API

Change-Id: I628b96ba1d51a3736bf996a611832c1a2c844af3

4 files changed, 11 insertions, 3 deletions

diff --git a/jack/src/com/android/jack/library/v0000/InputJackLibraryImpl.java b/jack/src/com/android/jack/library/v0000/InputJackLibraryImpl.java
index 317faf5c..0694786b 100644
--- a/jack/src/com/android/jack/library/v0000/InputJackLibraryImpl.java
+++ b/jack/src/com/android/jack/library/v0000/InputJackLibraryImpl.java
@@ -186,7 +186,7 @@ public class InputJackLibraryImpl extends InputJackLibrary {
   public void delete(@Nonnull FileType fileType, @Nonnull VPath typePath)
       throws CannotDeleteFileException, FileTypeDoesNotExistException {
     try {
-      inputVFS.getRootInputVDir().delete(fileType.buildFileVPath(typePath));
+      inputVFS.getRootInputVDir().getInputVFile(fileType.buildFileVPath(typePath)).delete();
     } catch (NotFileOrDirectoryException e) {
       throw new FileTypeDoesNotExistException(getLocation(), typePath, fileType);
     } catch (NoSuchFileException e) {
diff --git a/jack/src/com/android/jack/library/v0001/InputJackLibraryImpl.java b/jack/src/com/android/jack/library/v0001/InputJackLibraryImpl.java
index 6df3cb0e..d73de426 100644
--- a/jack/src/com/android/jack/library/v0001/InputJackLibraryImpl.java
+++ b/jack/src/com/android/jack/library/v0001/InputJackLibraryImpl.java
@@ -236,7 +236,8 @@ public class InputJackLibraryImpl extends InputJackLibrary {
       throws CannotDeleteFileException, FileTypeDoesNotExistException {
     try {
       InputVFS currentSectionVFS = getSectionVFS(fileType);
-      currentSectionVFS.getRootInputVDir().delete(buildFileVPath(fileType, typePath));
+      currentSectionVFS.getRootInputVDir().getInputVFile(buildFileVPath(fileType, typePath))
+          .delete();
     } catch (NotFileOrDirectoryException e) {
       throw new FileTypeDoesNotExistException(getLocation(), typePath, fileType);
     } catch (NoSuchFileException e) {
diff --git a/jack/src/com/android/jack/library/v0001/OutputJackLibraryImpl.java b/jack/src/com/android/jack/library/v0001/OutputJackLibraryImpl.java
index 7b976d45..b73e6f62 100644
--- a/jack/src/com/android/jack/library/v0001/OutputJackLibraryImpl.java
+++ b/jack/src/com/android/jack/library/v0001/OutputJackLibraryImpl.java
@@ -261,7 +261,8 @@ public class OutputJackLibraryImpl extends CommonJackLibrary implements OutputJa
       throws CannotDeleteFileException, FileTypeDoesNotExistException {
     assert !isClosed();
     try {
-      getSectionVFS(fileType).getRootInputVDir().delete(buildFileVPath(fileType, typePath));
+      getSectionVFS(fileType).getRootInputOutputVDir()
+          .getInputVFile(buildFileVPath(fileType, typePath)).delete();
     } catch (NotFileOrDirectoryException e) {
       throw new FileTypeDoesNotExistException(getLocation(), typePath, fileType);
     } catch (CannotCreateFileException e) {
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 d414086c..d7efc18e 100644
--- a/jack/src/com/android/jack/shrob/obfuscation/resource/RefinedVFile.java
+++ b/jack/src/com/android/jack/shrob/obfuscation/resource/RefinedVFile.java
@@ -16,6 +16,7 @@
 
 package com.android.jack.shrob.obfuscation.resource;
 
+import com.android.sched.util.file.CannotDeleteFileException;
 import com.android.sched.util.location.Location;
 import com.android.sched.vfs.AbstractVElement;
 import com.android.sched.vfs.InputVFile;
@@ -270,4 +271,9 @@ public class RefinedVFile extends AbstractVElement implements InputVFile {
       baseInputStream.close();
     }
   }
+
+  @Override
+  public void delete() throws CannotDeleteFileException {
+    file.delete();
+  }
 }