commit 43e10b031e3bb42df54adf8f0525a29d2b308a4e
author Andreas Gampe <agampe@google.com> Fri Jul 15 17:17:34 2016 -0700
committer Andreas Gampe <agampe@google.com> Fri Jul 15 20:54:09 2016 -0700
tree ea914f7c0061817f51449d15b900e6c1878e5cc8
parent edec0eb18d9a45d994acec9e8e509a1dc05bd5b3

ART: Replace ScopedFd with FdFile

FdFile can now be used like ScopedFd. Remove ScopedFd.

Bug: 21192156
Test: m test-art-host
Test: m test-art-target (shamu)
Change-Id: I32115fa8b2b8bb5aa5d1886eae63522f80ce836b

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index 8d20e5b..0d1d4d7 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -2145,7 +2145,8 @@
     TimingLogger::ScopedTiming t2("AddDexFileSources", timings_);
     if (zip_fd_ != -1) {
       DCHECK_EQ(oat_writers_.size(), 1u);
-      if (!oat_writers_[0]->AddZippedDexFilesSource(ScopedFd(zip_fd_), zip_location_.c_str())) {
+      if (!oat_writers_[0]->AddZippedDexFilesSource(File(zip_fd_, /* check_usage */ false),
+                                                    zip_location_.c_str())) {
         return false;
       }
     } else if (oat_writers_.size() > 1u) {