From 09b5f1fd61bfbb5afdaee81687a9c74c70a62b8a Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Thu, 25 Aug 2011 21:36:19 +0800
Subject: android: make DRM optional

For BOARD_GPU_DRIVERS=swrast build, DRM is not needed.
---
 Android.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 9dbb3c9a3d8..ed68aec65ca 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,7 +38,7 @@ DRM_GRALLOC_TOP := hardware/drm_gralloc
 classic_drivers :=
 gallium_drivers := swrast i915g nouveau r300g r600g vmwgfx
 
-MESA_GPU_DRIVERS := $(BOARD_GPU_DRIVERS)
+MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))
 
 # warn about invalid drivers
 invalid_drivers := $(filter-out \
@@ -97,12 +97,16 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_egl
 
 LOCAL_SHARED_LIBRARIES := \
 	libglapi \
-	libdrm \
 	libdl \
 	libhardware \
 	liblog \
 	libcutils
 
+# hardware drivers require DRM
+ifneq ($(MESA_GPU_DRIVERS),swrast)
+LOCAL_SHARED_LIBRARIES += libdrm
+endif
+
 ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
 
 gallium_DRIVERS :=
-- 
cgit v1.2.3