summaryrefslogtreecommitdiff
path: root/src/gbm
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2016-06-07 18:27:34 -0500
committerEmil Velikov <emil.l.velikov@gmail.com>2016-06-13 15:31:29 +0100
commit112e988329b6af817b4892b530f703e7997b1d7d (patch)
tree453baa9443909013215e54357808f668a9cbcb17 /src/gbm
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 <robh@kernel.org> Acked-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/gbm')
-rw-r--r--src/gbm/Android.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gbm/Android.mk b/src/gbm/Android.mk
index 6dc422c052d..a3f8fbbeabc 100644
--- a/src/gbm/Android.mk
+++ b/src/gbm/Android.mk
@@ -32,7 +32,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/main
-LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_STATIC_LIBRARIES := libmesa_loader
LOCAL_MODULE := libgbm