From ac296aee58158ccf1953e812a04f99eb5f8eb57b Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Wed, 20 May 2015 11:25:29 +0800 Subject: android: Depend on gallium_dri from EGL, instead of linking in gallium. The Android gallium build used to use gallium_egl, which was removed back in March. Instead, we will now use a normal Mesa libEGL loader with dlopen()ing of a DRI module. v2: add a clean step to rebuild all dri modules properly. v3: Squish the 2 patches doing this together (change by anholt). Signed-off-by: Chih-Wei Huang Reviewed-by: Eric Anholt --- Android.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index b19419b..6a09a9d 100644 --- a/Android.mk +++ b/Android.mk @@ -89,13 +89,9 @@ SUBDIRS := \ src/glsl \ src/mesa \ src/util \ - src/egl/main - -ifeq ($(strip $(MESA_BUILD_CLASSIC)),true) -SUBDIRS += \ + src/egl/main \ src/egl/drivers/dri2 \ src/mesa/drivers/dri -endif ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) SUBDIRS += src/gallium -- cgit v1.1