Add the splice engine for LP64.android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-preview

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

1 files changed, 10 insertions, 3 deletions

diff --git a/Android.mk b/Android.mk
index 69267b9d..5f074054 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,13 +33,17 @@ lib_src_files := lib/rbtree.c lib/flist_sort.c lib/getrusage.c lib/hweight.c lib
 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 @@ LOCAL_CFLAGS += -DFIO_VERSION="\"fio-2.1.8-80-g890b\"" \
                 -rdynamic \
                 -std=gnu99 \
 
+LOCAL_CFLAGSS_64 += \
+                -DCONFIG_LINUX_SPLICE \
+
 include $(BUILD_EXECUTABLE)