From 43e10b031e3bb42df54adf8f0525a29d2b308a4e Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 15 Jul 2016 17:17:34 -0700 Subject: 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/oat_test.cc') diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index 41b19601b9..18ebfeb7f4 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -158,7 +158,7 @@ class OatTest : public CommonCompilerTest { } bool WriteElf(File* file, - ScopedFd&& zip_fd, + File&& zip_fd, const char* location, SafeMap& key_value_store, bool verify) { @@ -708,8 +708,8 @@ void OatTest::TestZipFileInput(bool verify) { { // 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(), -- cgit v1.2.3-59-g8ed1b