Sync GRALLOC_MODULE_PERFORM_GET_DRM_FD definition with gbm_gralloc

[android-x86/external-drm_gralloc.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 4aecfb0..69e9286 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -25,30 +25,19 @@ DRM_GPU_DRIVERS := $(strip $(filter-out swrast, $(BOARD_GPU_DRIVERS)))
 
 freedreno_drivers := freedreno
 intel_drivers := i915 i965 i915g ilo
-radeon_drivers := r300g r600g
+radeon_drivers := r300g r600g radeonsi
 nouveau_drivers := nouveau
-vmwgfx_drivers := vmwgfx
 
 valid_drivers := \
        prebuilt \
        $(freedreno_drivers) \
        $(intel_drivers) \
        $(radeon_drivers) \
-       $(nouveau_drivers) \
-       $(vmwgfx_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))
-endif
+       $(nouveau_drivers)
 
-ifneq ($(filter $(vmwgfx_drivers), $(DRM_GPU_DRIVERS)),)
-DRM_USES_PIPE := true
-else
-DRM_USES_PIPE := false
+# 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)),)
@@ -70,7 +59,7 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := gralloc.$(TARGET_PRODUCT)
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw/
+LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SRC_FILES := ../../$(BOARD_GPU_DRIVER_BINARY)
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(TARGET_SHLIB_SUFFIX)
@@ -89,6 +78,9 @@ LOCAL_SRC_FILES := \
        gralloc_drm.c \
        gralloc_drm_kms.c
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+       $(LOCAL_PATH)
+
 LOCAL_SHARED_LIBRARIES := \
        libdrm \
        liblog \
@@ -119,40 +111,19 @@ LOCAL_CFLAGS += -DENABLE_NOUVEAU
 LOCAL_SHARED_LIBRARIES += libdrm_nouveau
 endif
 
-ifeq ($(strip $(DRM_USES_PIPE)),true)
+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/winsys \
-       external/mesa/src/gallium/drivers \
        external/mesa/src/gallium/auxiliary
 
-ifneq ($(filter r600g, $(DRM_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -DENABLE_PIPE_R600
-LOCAL_SHARED_LIBRARIES += libstlport
-LOCAL_STATIC_LIBRARIES += \
-       libmesa_pipe_r600 \
-       libmesa_pipe_radeon \
-       libmesa_winsys_radeon
-endif
-ifneq ($(filter vmwgfx, $(DRM_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -DENABLE_PIPE_VMWGFX
-LOCAL_STATIC_LIBRARIES += \
-       libmesa_pipe_svga \
-       libmesa_winsys_svga
-LOCAL_C_INCLUDES += \
-       external/mesa/src/gallium/drivers/svga/include
-endif
-
-LOCAL_STATIC_LIBRARIES += \
-       libmesa_gallium \
-       libmesa_util \
 
 LOCAL_SHARED_LIBRARIES += libdl
-endif # DRM_USES_PIPE
+endif # pipe_drivers
+
 include $(BUILD_SHARED_LIBRARY)
 
 
@@ -171,7 +142,7 @@ LOCAL_SHARED_LIBRARIES += \
 
 LOCAL_MODULE := gralloc.drm
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw/
+LOCAL_MODULE_RELATIVE_PATH := hw
 include $(BUILD_SHARED_LIBRARY)
 
 endif # DRM_GPU_DRIVERS=prebuilt