commit 30025095524e471ec347633e39f26ed0606bea65
author Nicolas Geoffray <ngeoffray@google.com> Thu Apr 19 14:43:29 2018 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Apr 24 14:39:06 2018 +0100
tree 533cbe1808445dcd4dd6d8b7dacc180fcc29b90a
parent cee49280366af9aa35e889e90d0ae0e90b453a22

Pass the fd to OatFile::Setup to avoid selinux errors.

bug: 77853712
Test: test.py
Change-Id: I069cda5296b561284d71b067924e1bc4a8562710

runtime/dexopt_test.cc

diff --git a/runtime/dexopt_test.cc b/runtime/dexopt_test.cc
index 8f0f9c6..f8388f3 100644
--- a/runtime/dexopt_test.cc
+++ b/runtime/dexopt_test.cc
@@ -105,7 +105,8 @@
   }
 
   // Verify the odex file was generated as expected.
-  std::unique_ptr<OatFile> odex_file(OatFile::Open(oat_location.c_str(),
+  std::unique_ptr<OatFile> odex_file(OatFile::Open(/* zip_fd */ -1,
+                                                   oat_location.c_str(),
                                                    oat_location.c_str(),
                                                    nullptr,
                                                    nullptr,