resolved conflicts for merge of 90531c44 to master
Change-Id: Ia51e784b350063ea085d7cc62bd693aa3a5be455
diff --git a/Android.mk b/Android.mk
index 13c8ee3..3e0b5ab 100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,7 +58,6 @@
LOCAL_SHARED_LIBRARIES := libdl
LOCAL_STATIC_LIBRARIES := libcutils libz
-LOCAL_LDLIBS += -ldl -lm
LOCAL_CFLAGS += -DFIO_VERSION="\"fio-2.2.6\"" \
-DCONFIG_3ARG_AFFINITY \
-DCONFIG_CLOCK_GETTIME \
@@ -102,7 +101,7 @@
-Wno-pointer-arith \
-Wno-sign-compare \
-LOCAL_CFLAGSS_64 += \
+LOCAL_CFLAGS_64 += \
-DCONFIG_LINUX_SPLICE \
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk