commit f44c05f87e8becbff468a4dd59c88b3a2a6bae5c
author Nicolas Geoffray <ngeoffray@google.com> Fri May 26 10:40:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 26 10:40:54 2017 +0000
tree 65c8e351b243f6a3753167fb276bf4286fe0ba8f
parent 8ac33bdab5149636cc1ac55a1e1adeed4e462c44
parent 362e56e41a847391c02706c170b21a6d1f6c6d68

Merge "Delete vdex file in delete_odex." am: 99dedeb690 am: f6b79dd073 am: 6dc664460d
am: 362e56e41a

Change-Id: I7594ff3af6fc72e4d155afab41ef3ae4cb1b60ef

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 7419eb4..22de64e 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -1940,8 +1940,11 @@
     // Derive and delete the app image.
     bool return_value_art = unlink_and_check(create_image_filename(out_path).c_str());
 
+    // Derive and delete the vdex file.
+    bool return_value_vdex = unlink_and_check(create_vdex_filename(out_path).c_str());
+
     // Report success.
-    return return_value_oat && return_value_art;
+    return return_value_oat && return_value_art && return_value_vdex;
 }
 
 }  // namespace installd