diff options
| author | 2016-07-16 04:46:46 +0000 | |
|---|---|---|
| committer | 2016-07-16 04:46:46 +0000 | |
| commit | 173f435e56acfd0501fc460747572a4796dcffe0 (patch) | |
| tree | 5e5716d1b07f229efb78783d26518511539ef5a3 /runtime/base/file_magic.h | |
| parent | 161c866ca742049f5c916696e1503c697be30e87 (diff) | |
| parent | 43e10b031e3bb42df54adf8f0525a29d2b308a4e (diff) | |
Merge "ART: Replace ScopedFd with FdFile"
Diffstat (limited to 'runtime/base/file_magic.h')
| -rw-r--r-- | runtime/base/file_magic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/base/file_magic.h b/runtime/base/file_magic.h index f7e4bad16d..4b5d2f5a48 100644 --- a/runtime/base/file_magic.h +++ b/runtime/base/file_magic.h @@ -20,12 +20,12 @@ #include <stdint.h> #include <string> -#include "ScopedFd.h" +#include "os.h" namespace art { // Open file and read magic number -ScopedFd OpenAndReadMagic(const char* filename, uint32_t* magic, std::string* error_msg); +File OpenAndReadMagic(const char* filename, uint32_t* magic, std::string* error_msg); // Check whether the given magic matches a known file type. bool IsZipMagic(uint32_t magic); |