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>

diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index 2de842ca417205d300e13c487f7323d306daf4ab..11818694f4f831c04433855d6a96ff475a9abb85 100644 (file)
--- 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