diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-07-29 00:27:32 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-13 00:46:56 +0100 |
| commit | 48307eb81341cf5682be8e0b4b468746ff09a0a0 (patch) | |
| tree | 7b5d7d08d2ba851e17e710edd5364cfecc50c1ff | |
| parent | c1cc3f2f194da54525607435b9e272f66d83c6cb (diff) | |
android: dri: use the installed libdrm headers
Saves us a few lines and brings us closer to the automake build.
Drop DRM_TOP as it's not longer used.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Android.mk | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/Android.mk | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Android.mk | 3 |
4 files changed, 3 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk index b50a8e0712e..591c2fc5143 100644 --- a/Android.mk +++ b/Android.mk @@ -38,7 +38,6 @@ MESA_ANDROID_VERSION := $(MESA_ANDROID_MAJOR_VERSION).$(MESA_ANDROID_MINOR_VERSI MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk MESA_PYTHON2 := python -DRM_TOP := external/drm DRM_GRALLOC_TOP := hardware/drm_gralloc classic_drivers := i915 i965 diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk index e0cf51c58fd..5cb6d7b05ed 100644 --- a/src/mesa/drivers/dri/Android.mk +++ b/src/mesa/drivers/dri/Android.mk @@ -37,8 +37,7 @@ MESA_DRI_CFLAGS := \ MESA_DRI_C_INCLUDES := \ $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \ $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \ - $(DRM_TOP) \ - $(DRM_TOP)/include/drm \ + $(TARGET_OUT_HEADERS)/libdrm \ external/expat/lib MESA_DRI_WHOLE_STATIC_LIBRARIES := \ diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk index c4f74d9fa6a..02052f8d6f8 100644 --- a/src/mesa/drivers/dri/i915/Android.mk +++ b/src/mesa/drivers/dri/i915/Android.mk @@ -38,8 +38,7 @@ LOCAL_CFLAGS := \ LOCAL_C_INCLUDES := \ $(addprefix $(MESA_TOP)/,$(i915_INCLUDES)) \ - $(MESA_DRI_C_INCLUDES) \ - $(DRM_TOP)/intel + $(MESA_DRI_C_INCLUDES) LOCAL_SRC_FILES := \ $(i915_FILES) diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 2c6446f8b38..7575882fa47 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -42,8 +42,7 @@ endif LOCAL_C_INCLUDES := \ $(i965_INCLUDES) \ - $(MESA_DRI_C_INCLUDES) \ - $(DRM_TOP)/intel + $(MESA_DRI_C_INCLUDES) LOCAL_SRC_FILES := \ $(i965_FILES) |