From 56a17581945bcf63038c6200e5637322b48eb4cc Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sat, 15 Sep 2012 04:44:06 +0200
Subject: [PATCH 4/4] libdrm: Add support for Android build system

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 Android.mk        |   37 +++++++++++++++++++++++++++++++++++++
 libkms/Android.mk |   23 +++++++++++++++++++++++
 libkms/api.c      |    3 ++-
 libkms/linux.c    |    3 ++-
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 Android.mk
 create mode 100644 libkms/Android.mk

diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..39ba22c
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,37 @@
+LOCAL_PATH := $(call my-dir)
+
+#
+# DRM
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+	xf86drm.c \
+	xf86drmHash.c \
+	xf86drmRandom.c \
+	xf86drmSL.c \
+	xf86drmMode.c
+
+LOCAL_MODULE := libdrm
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_C_INCLUDES += \
+	$(LOCAL_PATH)/include/drm
+
+LOCAL_COPY_HEADERS_TO := libdrm
+LOCAL_COPY_HEADERS := \
+	xf86drm.h \
+	xf86drmMode.h \
+	include/drm/drm.h \
+	include/drm/drm_fourcc.h \
+	include/drm/drm_mode.h \
+	include/drm/drm_sarea.h
+
+include $(BUILD_SHARED_LIBRARY)
+
+#
+# KMS
+#
+
+include $(LOCAL_PATH)/libkms/Android.mk
diff --git a/libkms/Android.mk b/libkms/Android.mk
new file mode 100644
index 0000000..f7e060a
--- /dev/null
+++ b/libkms/Android.mk
@@ -0,0 +1,22 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+	linux.c \
+	dumb.c \
+	api.c
+
+LOCAL_MODULE := libkms
+LOCAL_MODULE_TAGS := optional
+LOCAL_SHARED_LIBRARIES := libdrm
+
+LOCAL_C_INCLUDES += \
+	$(LOCAL_PATH)/.. \
+	$(LOCAL_PATH)/../include/drm
+
+LOCAL_COPY_HEADERS_TO := libdrm
+LOCAL_COPY_HEADERS := \
+	libkms.h
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/libkms/api.c b/libkms/api.c
index 5befaa0..c3dac75 100644
--- a/libkms/api.c
+++ b/libkms/api.c
@@ -25,8 +25,9 @@
  *
  **************************************************************************/
 
-
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libkms/linux.c b/libkms/linux.c
index 4f86121..2e1b10d 100644
--- a/libkms/linux.c
+++ b/libkms/linux.c
@@ -29,8 +29,9 @@
  * going from fd to pci id via fstat and udev.
  */
 
-
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-- 
1.7.8.6