Merge "Install the nonexistent-source symlink as a post-install step"
diff --git a/fastbootd/commands/partitions.c b/fastbootd/commands/partitions.c
index 3bfc298..dffad00 100644
--- a/fastbootd/commands/partitions.c
+++ b/fastbootd/commands/partitions.c
@@ -48,8 +48,6 @@
#include "utils.h"
#include "protocol.h"
-#define MMAP2_SHIFT 12
-
#define BLKRRPART _IO(0x12,95) /* re-read partition table */
#define BLKSSZGET _IO(0x12,104)
@@ -70,13 +68,6 @@
memset(entry, 0, sizeof(*entry));
}
-extern void* __mmap2(void *, size_t, int, int, int, off_t);
-
-static inline void *mmap64(void *addr, size_t length, int prot,
- int flags, int fd, uint64_t offset) {
- return __mmap2(addr, length, prot, flags, fd, offset >> MMAP2_SHIFT);
-}
-
/*
* returns mapped location to choosen area
* mapped_ptr is pointer to whole area mapped (it can be bigger then requested)
diff --git a/libsparse/output_file.c b/libsparse/output_file.c
index 5014e4a..2428022 100644
--- a/libsparse/output_file.c
+++ b/libsparse/output_file.c
@@ -46,15 +46,6 @@
#define off64_t off_t
#endif
-#ifdef __BIONIC__
-extern void* __mmap2(void *, size_t, int, int, int, off_t);
-static inline void *mmap64(void *addr, size_t length, int prot, int flags,
- int fd, off64_t offset)
-{
- return __mmap2(addr, length, prot, flags, fd, offset >> 12);
-}
-#endif
-
#define min(a, b) \
({ typeof(a) _a = (a); typeof(b) _b = (b); (_a < _b) ? _a : _b; })