Switch over to the google3 unix_file File*.
I also moved macros.h to base/macros.h to ease google3 porting, at
the expense of a larger than necessary change. (I learned my lesson,
though, and didn't make the equivalent base/logging.h change.)
I'm not sure whether we want to keep the unix_file MappedFile given
our existing MemMap, but it's easier to bring it over and then remove
it (and possibly revert the removal) than to bring it over later.
Change-Id: Id50a66faa5ab17b9bc936cc9043dbc26f791f0ca
diff --git a/src/oatdump.cc b/src/oatdump.cc
index 45d936a..cd8b4bb 100644
--- a/src/oatdump.cc
+++ b/src/oatdump.cc
@@ -22,10 +22,10 @@
#include <string>
#include <vector>
+#include "base/unix_file/fd_file.h"
#include "class_linker.h"
#include "dex_instruction.h"
#include "disassembler.h"
-#include "file.h"
#include "gc_map.h"
#include "gc/large_object_space.h"
#include "gc/space.h"
@@ -792,7 +792,7 @@
}
os << "STATS:\n" << std::flush;
UniquePtr<File> file(OS::OpenFile(image_filename_.c_str(), false));
- stats_.file_bytes = file->Length();
+ stats_.file_bytes = file->GetLength();
size_t header_bytes = sizeof(ImageHeader);
stats_.header_bytes = header_bytes;
size_t alignment_bytes = RoundUp(header_bytes, kObjectAlignment) - header_bytes;