summaryrefslogtreecommitdiff
path: root/compiler/oat_test.cc
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2016-07-16 04:46:46 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-07-16 04:46:46 +0000
commit173f435e56acfd0501fc460747572a4796dcffe0 (patch)
tree5e5716d1b07f229efb78783d26518511539ef5a3 /compiler/oat_test.cc
parent161c866ca742049f5c916696e1503c697be30e87 (diff)
parent43e10b031e3bb42df54adf8f0525a29d2b308a4e (diff)
Merge "ART: Replace ScopedFd with FdFile"
Diffstat (limited to 'compiler/oat_test.cc')
-rw-r--r--compiler/oat_test.cc6
1 files changed, 3 insertions, 3 deletions
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<std::string, std::string>& 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(),