aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers
diff options
context:
space:
mode:
authorRob Herring <[email protected]>2016-06-07 18:27:34 -0500
committerEmil Velikov <[email protected]>2016-06-13 15:31:29 +0100
commit112e988329b6af817b4892b530f703e7997b1d7d (patch)
tree453baa9443909013215e54357808f668a9cbcb17 /src/gallium/state_trackers
parent54e550ab8ad7ca5ebd24edbbb3f96e5412209ba9 (diff)
Android: move libdrm settings to top-level Android.common.mk
Fix warnings like these due to HAVE_LIBDRM being inconsistently defined: external/libdrm/include/drm/drm.h:839:30: warning: redefinition of typedef 'drm_clip_rect_t' is a C11 feature [-Wtypedef-redefinition] typedef struct drm_clip_rect drm_clip_rect_t; HAVE_LIBDRM needs to be set project wide to fix this. This change also harmlessly links libdrm with everything, but simplifies the makefiles a bit. Signed-off-by: Rob Herring <[email protected]> Acked-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r--src/gallium/state_trackers/dri/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/dri/Android.mk b/src/gallium/state_trackers/dri/Android.mk
index f0eb18dcacf..4bdd136ea97 100644
--- a/src/gallium/state_trackers/dri/Android.mk
+++ b/src/gallium/state_trackers/dri/Android.mk
@@ -46,7 +46,6 @@ endif
ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
LOCAL_SRC_FILES += $(dri2_SOURCES)
-LOCAL_SHARED_LIBRARIES := libdrm
endif
LOCAL_MODULE := libmesa_st_dri