diff options
| author | Rob Herring <[email protected]> | 2017-05-03 14:35:18 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-11 13:52:21 +0100 |
| commit | 88014bc0237ecba69a8a7c1e0f7094644e32c8a9 (patch) | |
| tree | 9bc65623f5d39760d31beea5d6288915d4511653 /src/gallium/state_trackers | |
| 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 <[email protected]>
Reviewed-by: Chih-Wei Huang <[email protected]>
[Emil Velikov: drop related inline comment]
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/dri/Android.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/dri/Android.mk b/src/gallium/state_trackers/dri/Android.mk index fd322a31383..97cf9376e19 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) |