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 <r...@kernel.org> Reviewed-by: Chih-Wei Huang <cwhu...@linux.org.tw> --- Android.common.mk | 2 -- src/gallium/auxiliary/pipe-loader/Android.mk | 7 +++---- src/gallium/state_trackers/dri/Android.mk | 8 +++----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Android.common.mk b/Android.common.mk index ba3d1203ac11..c9ec9ca66990 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -100,11 +100,9 @@ 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)\" diff --git a/src/gallium/auxiliary/pipe-loader/Android.mk b/src/gallium/auxiliary/pipe-loader/Android.mk index 006bb0ebfd9f..1e1bb11153fc 100644 --- a/src/gallium/auxiliary/pipe-loader/Android.mk +++ b/src/gallium/auxiliary/pipe-loader/Android.mk @@ -33,14 +33,13 @@ LOCAL_CFLAGS := \ -DDROP_PIPE_LOADER_MISC \ -DGALLIUM_STATIC_TARGETS -LOCAL_SRC_FILES := $(COMMON_SOURCES) +LOCAL_SRC_FILES := \ + $(COMMON_SOURCES) \ + $(DRM_SOURCES) LOCAL_MODULE := libmesa_pipe_loader -ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),) -LOCAL_SRC_FILES += $(DRM_SOURCES) LOCAL_STATIC_LIBRARIES := libmesa_loader -endif include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/state_trackers/dri/Android.mk b/src/gallium/state_trackers/dri/Android.mk index fd322a313832..97cf9376e199 100644 --- a/src/gallium/state_trackers/dri/Android.mk +++ b/src/gallium/state_trackers/dri/Android.mk @@ -27,7 +27,9 @@ include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(common_SOURCES) +LOCAL_SRC_FILES := \ + $(common_SOURCES) \ + $(dri2_SOURCES) LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ @@ -44,10 +46,6 @@ ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),) LOCAL_SRC_FILES += $(drisw_SOURCES) endif -ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),) -LOCAL_SRC_FILES += $(dri2_SOURCES) -endif - LOCAL_MODULE := libmesa_st_dri LOCAL_GENERATED_SOURCES := $(MESA_DRI_OPTIONS_H) -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev