summaryrefslogtreecommitdiffstats
path: root/src/mapi
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-09-27 17:36:29 +0100
committerEmil Velikov <[email protected]>2017-10-02 16:26:46 +0100
commitd884d8d0077c16d459b11699c552184dfec581b2 (patch)
tree86c5680dc33479c9394a58dd05ab565569381737 /src/mapi
parent21e271024d8e050b75361c2da2e5783100f2e87b (diff)
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 <[email protected]> Cc: Jon Turney <[email protected]> Cc: Julien Isorce <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> (v1) Tested-by: Tomasz Figa <[email protected]> (v1) Tested-by: Rob Herring <[email protected]>
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/Android.mk3
1 files changed, 3 insertions, 0 deletions
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