Merge "drm_hwcomposer: add GLES compositor" into mnc-dev
diff --git a/Android.mk b/Android.mk
index e3c3f0e..50d82e0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,15 +25,12 @@
libdrm \
libhardware \
liblog \
- libstlport \
libsync \
libutils \
LOCAL_C_INCLUDES := \
- bionic \
external/libdrm \
external/libdrm/include/drm \
- external/stlport/stlport \
system/core/include/utils \
system/core/libsync \
system/core/libsync/include \
diff --git a/hwcomposer.cpp b/hwcomposer.cpp
index f2e04b4..4256998 100644
--- a/hwcomposer.cpp
+++ b/hwcomposer.cpp
@@ -20,10 +20,13 @@
#include <errno.h>
#include <fcntl.h>
-#include <list>
#include <pthread.h>
+#include <stdlib.h>
#include <sys/param.h>
#include <sys/resource.h>
+
+#include <list>
+
#include <xf86drm.h>
#include <xf86drmMode.h>