diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2017-10-14 17:47:47 +0200 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2017-10-15 13:22:27 +0200 |
| commit | cc4a1183327e58f4a703dd23b49b4c659a2b2f51 (patch) | |
| tree | dcb245dab4c230e7cd207b313fdfa47313e32b58 | |
| parent | 4df276d7601226c3e93e600bad6093e6835bdc87 (diff) | |
| download | fio-linaro-upstream-3.1.tar.gz | |
Fix build on Androidlinaro-upstream-3.1
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | Android.mk | 12 | ||||
| -rw-r--r-- | oslib/strlcat.c | 2 | ||||
| -rw-r--r-- | oslib/strlcat.h | 2 |
3 files changed, 11 insertions, 5 deletions
@@ -33,19 +33,19 @@ main_src_files := gettime.c fio.c ioengines.c init.c stat.c log.c time.c \ iolog.c json.c libfio.c profiles/act.c profiles/tiobench.c \ server.c \ td_error.c diskutil.c blktrace.c trim.c fifo.c cgroup.c \ - workqueue.c rate-submit.c + workqueue.c rate-submit.c steadystate.c helper_thread.c lib_src_files := lib/rbtree.c lib/flist_sort.c lib/getrusage.c lib/hweight.c \ lib/ieee754.c lib/lfsr.c \ lib/mountcheck.c lib/num2str.c lib/prio_tree.c lib/rand.c \ lib/zipf.c lib/axmap.c lib/gauss.c lib/memalign.c \ lib/output_buffer.c lib/pattern.c lib/strntol.c \ - oslib/inet_aton.c oslib/linux-dev-lookup.c + oslib/inet_aton.c oslib/linux-dev-lookup.c lib/bloom.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 \ + crc/xxhash.c crc/sha3.c \ engines_src_files := engines/binject.c engines/cpu.c engines/mmap.c \ engines/null.c engines/net.c \ @@ -67,7 +67,7 @@ LOCAL_MODULE_TAGS := debug LOCAL_SHARED_LIBRARIES := libdl LOCAL_STATIC_LIBRARIES := libcutils libz -LOCAL_CFLAGS += -DFIO_VERSION="\"fio-2.1.8-80-g890b\"" \ +LOCAL_CFLAGS += -DFIO_VERSION="\"fio-3.1\"" \ -DCONFIG_3ARG_AFFINITY \ -DCONFIG_CLOCK_GETTIME \ -DCONFIG_CLOCK_MONOTONIC \ @@ -89,7 +89,6 @@ LOCAL_CFLAGS += -DFIO_VERSION="\"fio-2.1.8-80-g890b\"" \ -DCONFIG_TCP_NODELAY \ -DCONFIG_TLS_THREAD \ -DCONFIG_ZLIB \ - -DFIO_HAVE_CGROUPS \ -DFIO_INC_DEBUG \ -DFIO_INTERNAL \ -DNO_GETMNTENT_R \ @@ -110,6 +109,9 @@ LOCAL_CFLAGS += -DFIO_VERSION="\"fio-2.1.8-80-g890b\"" \ -std=gnu99 \ -Wno-pointer-arith \ -Wno-sign-compare \ + -Wno-error=unused-parameter \ + -Wno-error=missing-field-initializers \ + -Wno-error=unused-variable LOCAL_CFLAGS_64 += \ -DCONFIG_LINUX_SPLICE \ diff --git a/oslib/strlcat.c b/oslib/strlcat.c index 3b33d0eb..2ca591e0 100644 --- a/oslib/strlcat.c +++ b/oslib/strlcat.c @@ -1,6 +1,7 @@ #include <string.h> #include "strlcat.h" +#ifndef ANDROID size_t strlcat(char *dst, const char *src, size_t size) { size_t dstlen; @@ -22,3 +23,4 @@ size_t strlcat(char *dst, const char *src, size_t size) return dstlen + srclen; } +#endif diff --git a/oslib/strlcat.h b/oslib/strlcat.h index baeace40..8954343e 100644 --- a/oslib/strlcat.h +++ b/oslib/strlcat.h @@ -1,6 +1,8 @@ #ifndef FIO_STRLCAT_H #define FIO_STRLCAT_H +#ifndef ANDROID /* Android has strlcat */ size_t strlcat(char *dst, const char *src, size_t size); +#endif #endif |