diff options
| author | Rob Herring <robh@kernel.org> | 2016-06-07 18:27:34 -0500 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-06-13 15:31:29 +0100 |
| commit | 112e988329b6af817b4892b530f703e7997b1d7d (patch) | |
| tree | 453baa9443909013215e54357808f668a9cbcb17 /Android.common.mk | |
| parent | 54e550ab8ad7ca5ebd24edbbb3f96e5412209ba9 (diff) | |
| download | mesa-112e988329b6af817b4892b530f703e7997b1d7d.tar.gz mesa-112e988329b6af817b4892b530f703e7997b1d7d.tar.bz2 mesa-112e988329b6af817b4892b530f703e7997b1d7d.zip | |
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 'Android.common.mk')
| -rw-r--r-- | Android.common.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.common.mk b/Android.common.mk index 831cbe59ff0..dee22dae097 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -82,6 +82,12 @@ LOCAL_CFLAGS += \ -D__STDC_LIMIT_MACROS endif +# add libdrm if there are hardware drivers +ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),) +LOCAL_CFLAGS += -DHAVE_LIBDRM +LOCAL_SHARED_LIBRARIES += libdrm +endif + LOCAL_CPPFLAGS += \ $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \ -Wno-error=non-virtual-dtor \ |