android: rework the EGL build
See previous two commits for details.
v2: Don't forget git mv, bring back DRM_GRALLOC_TOP. Spotted by Varad.
Cc: Chih-Wei Huang <cwhuang@android-x86.org>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>
Tested-by: Varad Gautam <varadgautam@gmail.com>
diff --git a/Android.mk b/Android.mk
index 69e0d33..17fd5f5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -91,8 +91,7 @@
src/glsl \
src/mesa \
src/util \
- src/egl/main \
- src/egl/drivers/dri2 \
+ src/egl \
src/mesa/drivers/dri
ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)