From d884d8d0077c16d459b11699c552184dfec581b2 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.velikov@collabora.com>
Date: Wed, 27 Sep 2017 17:36:29 +0100
Subject: egl/dri: link directly to libglapi.so

Shared glapi (libglapi.so) has been a requirement for years, in order
to build EGL.

Remove the no longer necessary dlopen/dlsym dance and link to the
library directly.

This allows us to remove a handful of platform specific workarounds, due
to the different name of the library.

v2:
 - Android: export the include dir (RobH)
 - Drop unused local variable (Eric)

Cc: Jonathan Gray <jsg@jsg.id.au>
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Cc: Julien Isorce <julien.isorce@gmail.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> (v1)
Tested-by: Tomasz Figa <tfiga@chromium.org> (v1)
Tested-by: Rob Herring <robh@kernel.org>
---
 src/mapi/Android.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/mapi')

diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk
index 552bab69625..06a76470099 100644
--- a/src/mapi/Android.mk
+++ b/src/mapi/Android.mk
@@ -50,6 +50,9 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/mapi
 
+LOCAL_EXPORT_C_INCLUDES := \
+	$(MESA_TOP)/src/mapi
+
 LOCAL_MODULE := libglapi
 
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-- 
cgit v1.2.3