Fix build inside Android 5.1.1 trees
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
diff --git a/Android.mk b/Android.mk
index 7002f00..dd4dbf5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,11 +30,14 @@
cconv.c client.c filelock.c flow.c gettime-thread.c idletime.c io_u_queue.c \
iolog.c json.c libfio.c memalign.c profiles/act.c profiles/tiobench.c server.c \
td_error.c diskutil.c blktrace.c trim.c fifo.c cgroup.c \
+ workqueue.c
lib_src_files := lib/rbtree.c lib/flist_sort.c lib/getrusage.c lib/hweight.c lib/ieee754.c lib/lfsr.c \
lib/num2str.c lib/prio_tree.c lib/rand.c lib/zipf.c lib/inet_aton.c lib/axmap.c \
+ lib/gauss.c lib/tp.c lib/linux-dev-lookup.c
crc_src_files := crc/crc7.c crc/crc16.c crc/crc32.c crc/crc64.c crc/crc32c.c crc/crc32c-intel.c \
+ crc/fnv.c crc/murmur3.c \
crc/sha1.c crc/sha256.c crc/sha512.c crc/md5.c crc/test.c crc/xxhash.c \
engines_src_files := engines/binject.c engines/cpu.c engines/mmap.c engines/null.c engines/net.c \
@@ -105,4 +108,6 @@
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
+LOCAL_C_INCLUDES = external/zlib
+
include $(BUILD_EXECUTABLE)
diff --git a/stat.c b/stat.c
index 9a30bea..57ed601 100644
--- a/stat.c
+++ b/stat.c
@@ -512,6 +512,7 @@
default:
assert(0);
}
+ __builtin_unreachable();
}
static int compare_block_infos(const void *bs1, const void *bs2)