commit b9da4221fd8a628a696d70c33ba1e7e8cc00a8fe
author Nick Kralevich <nnk@google.com> Mon Apr 06 16:03:45 2015 -0700
committer Nick Kralevich <nnk@google.com> Mon Apr 06 16:03:45 2015 -0700
tree 521217fc166478a4a6bfeb0ecd2f6d212e0746cd
parent 365a153cfe8a3601af5d7c6c87679c20e84314e5
parent 90531c44420bef2430dc3be2fbcf38682a6df973

resolved conflicts for merge of 90531c44 to master

Change-Id: Ia51e784b350063ea085d7cc62bd693aa3a5be455

Android.mk

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