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

Remove components that can't be built temporarily.
---
 BoardConfig.mk            | 2 +-
 packages.mk               | 2 --
 tablet-mode/tablet-mode.c | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7faf53b..c3a18eb 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -70,7 +70,7 @@ BOARD_WPA_SUPPLICANT_PRIVATE_LIB ?= private_lib_driver_cmd
 WPA_SUPPLICANT_VERSION ?= VER_2_1_DEVEL
 WIFI_DRIVER_MODULE_PATH ?= auto
 
-BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi swrast
+BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g swrast
 ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
 TARGET_HARDWARE_3D := true
 BOARD_EGL_CFG ?= device/generic/common/gpu/egl_mesa.cfg
diff --git a/packages.mk b/packages.mk
index dc06b59..1c6cd05 100644
--- a/packages.mk
+++ b/packages.mk
@@ -46,7 +46,6 @@ PRODUCT_PACKAGES := \
     libhuaweigeneric-ril \
     lights.default \
     make_ext4fs \
-    parted \
     powerbtnd \
     scp \
     sensors.hsb \
@@ -76,6 +75,5 @@ PRODUCT_PACKAGES += \
 
 # Third party apps
 PRODUCT_PACKAGES += \
-    CMFileManager \
     Superuser \
     TSCalibration2 \
diff --git a/tablet-mode/tablet-mode.c b/tablet-mode/tablet-mode.c
index aea8d97..a06778f 100644
--- a/tablet-mode/tablet-mode.c
+++ b/tablet-mode/tablet-mode.c
@@ -16,6 +16,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <dirent.h>
+#include <string.h>
 #include <cutils/log.h>
 #include <linux/input.h>
 #include <linux/uinput.h>
-- 
2.11.0