android: gallium: use the installed libdrm headers

Saves us a few lines and brings us closer to the automake build.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/winsys/i915/drm/Android.mk b/src/gallium/winsys/i915/drm/Android.mk
index c72d203..ffcf4d5 100644 (file)
--- a/src/gallium/winsys/i915/drm/Android.mk
+++ b/src/gallium/winsys/i915/drm/Android.mk
@@ -30,10 +30,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
 
-LOCAL_C_INCLUDES := \
-       $(DRM_TOP) \
-       $(DRM_TOP)/include/drm \
-       $(DRM_TOP)/intel
+LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/libdrm
 
 LOCAL_MODULE := libmesa_winsys_i915
 

diff --git a/src/gallium/winsys/intel/drm/Android.mk b/src/gallium/winsys/intel/drm/Android.mk
index a375b59..a391883 100644 (file)
--- a/src/gallium/winsys/intel/drm/Android.mk
+++ b/src/gallium/winsys/intel/drm/Android.mk
@@ -29,10 +29,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
 
-LOCAL_C_INCLUDES := \
-       $(DRM_TOP) \
-       $(DRM_TOP)/include/drm \
-       $(DRM_TOP)/intel
+LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/libdrm
 
 LOCAL_MODULE := libmesa_winsys_intel
 

diff --git a/src/gallium/winsys/svga/drm/Android.mk b/src/gallium/winsys/svga/drm/Android.mk
index f6398e0..a26138e 100644 (file)
--- a/src/gallium/winsys/svga/drm/Android.mk
+++ b/src/gallium/winsys/svga/drm/Android.mk
@@ -35,8 +35,7 @@ LOCAL_CFLAGS := -D_FILE_OFFSET_BITS=64
 LOCAL_C_INCLUDES := \
        $(GALLIUM_TOP)/drivers/svga \
        $(GALLIUM_TOP)/drivers/svga/include \
-       $(DRM_TOP) \
-       $(DRM_TOP)/include/drm
+       $(TARGET_OUT_HEADERS)/libdrm
 
 LOCAL_MODULE := libmesa_winsys_svga