[Mesa-dev] [PATCH 26/29] android: gallium: use the installed libdrm headers

Emil Velikov emil.l.velikov at gmail.com
Tue Jul 29 15:54:38 PDT 2014


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

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/winsys/i915/drm/Android.mk  | 5 +----
 src/gallium/winsys/intel/drm/Android.mk | 5 +----
 src/gallium/winsys/svga/drm/Android.mk  | 3 +--
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/gallium/winsys/i915/drm/Android.mk b/src/gallium/winsys/i915/drm/Android.mk
index c72d203..ffcf4d5 100644
--- 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
--- 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
--- 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
 
-- 
2.0.2



More information about the mesa-dev mailing list