commit f6b79dd073a677a7754c10384fbd084ae8595005
author Nicolas Geoffray <ngeoffray@google.com> Fri May 26 10:28:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 26 10:28:16 2017 +0000
tree 50086651b8f036371ba58ce7a38b4de4adb5fe77
parent 9a130151a29e5d61dfedea0bb32d7f2bb0bda0f5
parent 99dedeb690856e0f0b91b9de0bc24c36216add97

Merge "Delete vdex file in delete_odex."
am: 99dedeb690

Change-Id: Idccc7fa241cdbb72b0ac5672978350a269ac8378

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 797cc15..53ac349 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -1862,8 +1862,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;
 }
 
 int dexopt(const char* const params[DEXOPT_PARAM_COUNT]) {