commit 6f4e805b805f1ab3025482e471147bb51efa99bd
author Elliott Hughes <enh@google.com> Tue Jun 24 16:55:57 2014 -0700
committer Elliott Hughes <enh@google.com> Wed Jun 25 12:07:38 2014 -0700
tree b2afee1a069ef2569e8b39f7ec04070ec41fe176
parent 3c77c1316cdd85e5c6dbb3d506e5fab44e5407ec

Add the splice engine for LP64.

This code assumes _FILE_OFFSET_BITS == 64, which bionic still doesn't
support, so it's more trouble than it's worth to add splice for LP32.

Change-Id: I0f7c35586edfee63bf15f689422606a8d159daad

Android.mk

diff --git a/Android.mk b/Android.mk
index 69267b9..5f07405 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,13 +33,17 @@
 crc_src_files := crc/crc7.c crc/crc16.c crc/crc32.c crc/crc64.c crc/crc32c.c crc/crc32c-intel.c \
                  crc/sha1.c crc/sha256.c crc/sha512.c crc/md5.c crc/test.c crc/xxhash.c \
 
-engines_src_files := engines/cpu.c engines/mmap.c engines/sync.c engines/null.c engines/net.c \
-                     engines/sg.c engines/binject.c
+engines_src_files := engines/binject.c engines/cpu.c engines/mmap.c engines/null.c engines/net.c \
+                     engines/sg.c engines/sync.c \
+
+engines_src_files_64 := engines/splice.c
 
 LOCAL_SRC_FILES := $(main_src_files) \
                    $(lib_src_files) \
                    $(crc_src_files) \
-                   $(engines_src_files)
+                   $(engines_src_files) \
+
+LOCAL_SRC_FILES_64 += $(engines_src_files_64)
 
 LOCAL_MODULE := fio
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
@@ -93,4 +97,7 @@
                 -rdynamic \
                 -std=gnu99 \
 
+LOCAL_CFLAGSS_64 += \
+                -DCONFIG_LINUX_SPLICE \
+
 include $(BUILD_EXECUTABLE)