commit 1b5a5dc82b9618d9deef62962954bfb9871a88d1
author Andreas Gampe <agampe@google.com> Wed Sep 17 21:49:47 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 17 21:49:47 2014 +0000
tree f9a882292875d867040ba91b91125bebdc393e61
parent 347409fdbdf8b9d3638beb7dbdb8c51b843bd899
parent 33cb94e5e5b50330fb9fbafe90d1a2a6bd026e2f

Merge "ART: Sync oat file to disk before patching"

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index b64390b..afc01dc 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -442,6 +442,11 @@
       return nullptr;
     }
 
+    // Flush result to disk. Patching code will re-open the file (mmap), so ensure that our view
+    // of the file already made it there and won't be re-ordered with writes from PatchOat or
+    // image patching.
+    oat_file->Flush();
+
     if (!driver->IsImage() && driver->GetCompilerOptions().GetIncludePatchInformation()) {
       t2.NewTiming("Patching ELF");
       std::string error_msg;