diff options
Diffstat (limited to 'src/common/linux')
| -rw-r--r-- | src/common/linux/file_id.cc | 3 | ||||
| -rw-r--r-- | src/common/linux/memory_mapped_file.cc | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/common/linux/file_id.cc b/src/common/linux/file_id.cc index bffef621..ff2f29e2 100644 --- a/src/common/linux/file_id.cc +++ b/src/common/linux/file_id.cc @@ -36,10 +36,11 @@ #include <arpa/inet.h> #include <assert.h> -#include <elf.h> #if defined(__ANDROID__) +#include <linux/elf.h> #include "client/linux/android_link.h" #else +#include <elf.h> #include <link.h> #endif #include <string.h> diff --git a/src/common/linux/memory_mapped_file.cc b/src/common/linux/memory_mapped_file.cc index 6f450bd3..32fc3b18 100644 --- a/src/common/linux/memory_mapped_file.cc +++ b/src/common/linux/memory_mapped_file.cc @@ -34,6 +34,9 @@ #include <fcntl.h> #include <sys/mman.h> +#if defined(__ANDROID__) +#include <sys/stat.h> +#endif #include <unistd.h> #include "common/memory_range.h" @@ -59,7 +62,10 @@ bool MemoryMappedFile::Map(const char* path) { return false; } -#if defined(__x86_64__) +#if defined(__ANDROID__) + struct stat st; + if (fstat(fd, &st) != 0) { +#elif defined(__x86_64__) struct kernel_stat st; if (sys_fstat(fd, &st) == -1 || st.st_size < 0) { #else |