commit 0bc052e9bcd721607eb8b25e220edce2ce1bcb28
author Nicolas Geoffray <ngeoffray@google.com> Wed May 10 09:31:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 10 09:31:15 2017 +0000
tree d5e2fa37fd43b3da5d653d143a9c52b0914f020b
parent abaf14cd6f3873a2067e3573792dad362e130695
parent 2087818222c77f99159437fc3964a845f30c3f46

Merge "Always unlink the out_vdex_file." am: fbb09a7192 am: e5a1bc620b
am: 2087818222

Change-Id: Iab9661cb66924b200263acaac4ce4f2876481a52

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index bb499e6..3bbe3a1 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -1202,7 +1202,11 @@
     if (dexopt_action == DEX2OAT_FOR_BOOT_IMAGE &&
             in_vdex_wrapper_fd->get() != -1 &&
             in_vdex_path_str == out_vdex_path_str) {
-        out_vdex_wrapper_fd->reset(in_vdex_wrapper_fd->get());
+        // We unlink the file in case the invocation of dex2oat fails, to ensure we don't
+        // have bogus stale vdex files.
+        out_vdex_wrapper_fd->reset(
+              in_vdex_wrapper_fd->get(),
+              [out_vdex_path_str]() { unlink(out_vdex_path_str.c_str()); });
         // Disable auto close for the in wrapper fd (it will be done when destructing the out
         // wrapper).
         in_vdex_wrapper_fd->DisableAutoClose();