diff options
| author | Rob Herring <robh@kernel.org> | 2017-05-03 14:35:18 -0500 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-05-11 13:52:21 +0100 |
| commit | 88014bc0237ecba69a8a7c1e0f7094644e32c8a9 (patch) | |
| tree | 9bc65623f5d39760d31beea5d6288915d4511653 /Android.common.mk | |
| parent | 1ef913aacfaca03bd951f23c4a60d1fccd5c3b6c (diff) | |
Android: Fix swrast only build
A build of only swrast is broken as the Android EGL now depends on
libdrm as does GBM. While we could make EGL conditionally depend on
libdrm, we probably want to enable kms_dri winsys as well and that will
need libdrm enabled. So just always enable libdrm and simplify the
Android makefiles a bit.
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>
[Emil Velikov: drop related inline comment]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'Android.common.mk')
| -rw-r--r-- | Android.common.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Android.common.mk b/Android.common.mk index 98d98ee7ce5..adfe4a17307 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -102,12 +102,9 @@ ifeq ($(MESA_ENABLE_LLVM),true) endif ifneq ($(LOCAL_IS_HOST_MODULE),true) -# add libdrm if there are hardware drivers -ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),) LOCAL_CFLAGS += -DHAVE_LIBDRM LOCAL_SHARED_LIBRARIES += libdrm endif -endif LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\" LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\" |