Mesa (master): Android: egl: add dependency on libnativewindow
Rob Herring
robh at kemper.freedesktop.org
Thu Oct 26 21:09:24 UTC 2017
Module: Mesa
Branch: master
Commit: 90dd6e5bb9f490a5ba8b86c6b0145554fc8d8a84
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=90dd6e5bb9f490a5ba8b86c6b0145554fc8d8a84
Author: Rob Herring <robh at kernel.org>
Date: Thu Oct 26 14:18:22 2017 -0500
Android: egl: add dependency on libnativewindow
system/window.h is no longer available by default and is part of
libnativewindow, so add it to the shared libraries. It has to be conditional
because the library is only present in O and later.
Really, we should only be depending on vndk/window.h now, but that's only
in O and changing would be pretty invasive.
Signed-off-by: Rob Herring <robh at kernel.org>
---
src/egl/Android.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index 2de842ca41..11818694f4 100644
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -60,6 +60,10 @@ LOCAL_SHARED_LIBRARIES := \
libgralloc_drm \
libsync
+ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),)
+LOCAL_SHARED_LIBRARIES += libnativewindow
+endif
+
# This controls enabling building of driver libraries
ifneq ($(HAVE_I915_DRI),)
LOCAL_REQUIRED_MODULES += i915_dri
More information about the mesa-commit
mailing list