From d359c3a8ec7885d5b3c6061db50aa1dde5ae9f53 Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Sun, 11 Oct 2015 01:53:44 +0800
Subject: [PATCH] Fix the building issues on Android 6.0

The stlport is gone.
---
 Android.mk           | 12 ++++--------
 InputEventReader.cpp |  1 +
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Android.mk b/Android.mk
index ab13e03..8d13ef8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,45 +35,41 @@ sensor_src_files := HidSensor_Accel3D.cpp \
 		    OrientationSensor.cpp \
 
 include $(CLEAR_VARS)
-include external/stlport/libstlport.mk
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/bdw_rvp
 LOCAL_MODULE := sensors.bdw_rvp
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\"
-LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libstlport
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 LOCAL_SRC_FILES := $(common_src_files) $(sensor_src_files) bdw_rvp/BoardConfig.cpp
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-include external/stlport/libstlport.mk
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/bdw_wsb
 LOCAL_MODULE := sensors.bdw_wsb
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\"
-LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libstlport
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 LOCAL_SRC_FILES := $(common_src_files) $(sensor_src_files) bdw_wsb/BoardConfig.cpp
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-include external/stlport/libstlport.mk
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/bytm
 LOCAL_MODULE := sensors.bytm
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\"
-LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libstlport
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 LOCAL_SRC_FILES := $(common_src_files) $(sensor_src_files) bytm/BoardConfig.cpp
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-include external/stlport/libstlport.mk
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/hsb
 LOCAL_MODULE := sensors.hsb
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\"
-LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libstlport
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 LOCAL_SRC_FILES := $(common_src_files) $(sensor_src_files) hsb/BoardConfig.cpp
 include $(BUILD_SHARED_LIBRARY)
diff --git a/InputEventReader.cpp b/InputEventReader.cpp
index 1014f29..ef644ba 100644
--- a/InputEventReader.cpp
+++ b/InputEventReader.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <cstring>
 #include <stdint.h>
 #include <errno.h>
 #include <unistd.h>
-- 
2.11.0