Delete vdex file in delete_odex.
(cherry picked from commit 192fb9662ce8b2a60da2b280d8000283fb3b6f6b)
bug: 38513395
Test: unfortunately no unit test here, so after discussing
with agampe@ just relied on build.
Change-Id: I305ddaadc813673fb55473f5e8ca357f39cf98f3
(cherry picked from commit 3040d9db984237259c0ec7238ad9081018ffe808)
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index b20a807..fea7b0d 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -1880,8 +1880,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
