From b3271125eea1ccaef904b0d7eb8e97c4499b3603 Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Sat, 27 Aug 2016 23:21:31 +0200 Subject: enable drm_gralloc module for swrast Even if only swrast/llvmpipe is selected, there is still a dependency on drm_gralloc. Removing the dependency seems to be too much work. The path for the Mesa repo needs to be adapted. Signed-off-by: Wolfgang Wiedmeyer --- Android.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Android.mk b/Android.mk index 69e9286..f20e055 100644 --- a/Android.mk +++ b/Android.mk @@ -21,7 +21,7 @@ # Android.mk for drm_gralloc -DRM_GPU_DRIVERS := $(strip $(filter-out swrast, $(BOARD_GPU_DRIVERS))) +DRM_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS)) freedreno_drivers := freedreno intel_drivers := i915 i965 i915g ilo @@ -115,10 +115,10 @@ ifneq ($(filter pipe, $(DRM_GPU_DRIVERS)),) LOCAL_SRC_FILES += gralloc_drm_pipe.c LOCAL_CFLAGS += -DENABLE_PIPE LOCAL_C_INCLUDES += \ - external/mesa/include \ - external/mesa/src \ - external/mesa/src/gallium/include \ - external/mesa/src/gallium/auxiliary + external/mesa3d/include \ + external/mesa3d/src \ + external/mesa3d/src/gallium/include \ + external/mesa3d/src/gallium/auxiliary LOCAL_SHARED_LIBRARIES += libdl -- cgit v1.1