diff options
| author | Rob Herring <[email protected]> | 2016-06-07 18:27:34 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-06-13 15:31:29 +0100 |
| commit | 112e988329b6af817b4892b530f703e7997b1d7d (patch) | |
| tree | 453baa9443909013215e54357808f668a9cbcb17 /src/gallium/drivers/vc4/Android.mk | |
| parent | 54e550ab8ad7ca5ebd24edbbb3f96e5412209ba9 (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/drivers/vc4/Android.mk')
| -rw-r--r-- | src/gallium/drivers/vc4/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/drivers/vc4/Android.mk b/src/gallium/drivers/vc4/Android.mk index 2efb4722636..de9d5e3f5b3 100644 --- a/src/gallium/drivers/vc4/Android.mk +++ b/src/gallium/drivers/vc4/Android.mk @@ -30,7 +30,6 @@ LOCAL_SRC_FILES := \ LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) -LOCAL_SHARED_LIBRARIES := libdrm # We need libmesa_nir to get NIR's generated include directories. LOCAL_STATIC_LIBRARIES := libmesa_nir LOCAL_MODULE := libmesa_pipe_vc4 |