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

compiler/oat_test.cc

diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc
index 41b1960..18ebfeb 100644
--- a/compiler/oat_test.cc
+++ b/compiler/oat_test.cc
@@ -158,7 +158,7 @@
   }
 
   bool WriteElf(File* file,
-                ScopedFd&& zip_fd,
+                File&& zip_fd,
                 const char* location,
                 SafeMap<std::string, std::string>& key_value_store,
                 bool verify) {
@@ -708,8 +708,8 @@
 
   {
     // Test using the AddZipDexFileSource() interface with the zip file handle.
-    ScopedFd zip_fd(dup(zip_file.GetFd()));
-    ASSERT_NE(-1, zip_fd.get());
+    File zip_fd(dup(zip_file.GetFd()), /* check_usage */ false);
+    ASSERT_NE(-1, zip_fd.Fd());
 
     ScratchFile oat_file;
     success = WriteElf(oat_file.GetFile(),