summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2017-10-26 14:18:22 -0500
committerRob Herring <robh@kernel.org>2017-10-26 16:06:53 -0500
commit90dd6e5bb9f490a5ba8b86c6b0145554fc8d8a84 (patch)
tree65fb3c21782acd3d0374ec7935b9a9e3182b9114
parenteb3bb03b34da02f2e368e84833a037afa7379476 (diff)
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@kernel.org>
-rw-r--r--src/egl/Android.mk4
1 files changed, 4 insertions, 0 deletions
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