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/build/Android.common.mk b/build/Android.common.mk
index 7873645..cd0b27f 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -132,6 +132,11 @@
LIBART_COMMON_SRC_FILES := \
src/atomic.cc.arm \
+ src/base/unix_file/fd_file.cc \
+ src/base/unix_file/mapped_file.cc \
+ src/base/unix_file/null_file.cc \
+ src/base/unix_file/random_access_file_utils.cc \
+ src/base/unix_file/string_file.cc \
src/barrier.cc \
src/check_jni.cc \
src/class_linker.cc \
@@ -148,8 +153,6 @@
src/disassembler_mips.cc \
src/disassembler_x86.cc \
src/dlmalloc.cc \
- src/file.cc \
- src/file_linux.cc \
src/gc/card_table.cc \
src/gc/garbage_collector.cc \
src/gc/heap_bitmap.cc \
@@ -358,13 +361,17 @@
TEST_COMMON_SRC_FILES := \
src/barrier_test.cc \
+ src/base/unix_file/fd_file_test.cc \
+ src/base/unix_file/mapped_file_test.cc \
+ src/base/unix_file/null_file_test.cc \
+ src/base/unix_file/random_access_file_utils_test.cc \
+ src/base/unix_file/string_file_test.cc \
src/class_linker_test.cc \
src/compiler_test.cc \
src/dex_cache_test.cc \
src/dex_file_test.cc \
src/dex_instruction_visitor_test.cc \
src/exception_test.cc \
- src/file_test.cc \
src/gc/space_bitmap_test.cc \
src/gc/space_test.cc \
src/gtest_test.cc \