From 42156ec30b9b5853fb2034b91a5ca4f525232f95 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 16 Feb 2016 15:45:25 -0600 Subject: Build pipe support by default Build pipe support by default when any unlisted driver is enabled. This way gralloc doesn't have to be updated for every new driver. Signed-off-by: Rob Herring --- Android.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Android.mk b/Android.mk index 076e7f8..ce1b527 100644 --- a/Android.mk +++ b/Android.mk @@ -27,22 +27,17 @@ freedreno_drivers := freedreno intel_drivers := i915 i965 i915g ilo radeon_drivers := r300g r600g radeonsi nouveau_drivers := nouveau -pipe_drivers := freedreno virgl vmwgfx valid_drivers := \ prebuilt \ - $(pipe_drivers) \ $(freedreno_drivers) \ $(intel_drivers) \ $(radeon_drivers) \ $(nouveau_drivers) -# warn about invalid drivers -invalid_drivers := $(filter-out $(valid_drivers), $(DRM_GPU_DRIVERS)) -ifneq ($(invalid_drivers),) -$(warning invalid GPU drivers: $(invalid_drivers)) -# tidy up -DRM_GPU_DRIVERS := $(filter-out $(invalid_drivers), $(DRM_GPU_DRIVERS)) +# Assume other driver names are pipe drivers +ifneq ($(filter-out $(valid_drivers), $(DRM_GPU_DRIVERS)),) +DRM_GPU_DRIVERS += pipe endif ifneq ($(strip $(DRM_GPU_DRIVERS)),) @@ -116,7 +111,7 @@ LOCAL_CFLAGS += -DENABLE_NOUVEAU LOCAL_SHARED_LIBRARIES += libdrm_nouveau endif -ifneq ($(filter $(pipe_drivers), $(DRM_GPU_DRIVERS)),) +ifneq ($(filter pipe, $(DRM_GPU_DRIVERS)),) LOCAL_SRC_FILES += gralloc_drm_pipe.c LOCAL_CFLAGS += -DENABLE_PIPE LOCAL_C_INCLUDES += \ -- cgit v1.1