From 90dd6e5bb9f490a5ba8b86c6b0145554fc8d8a84 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 26 Oct 2017 14:18:22 -0500 Subject: [PATCH] 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 --- src/egl/Android.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/egl/Android.mk b/src/egl/Android.mk index 2de842ca417..11818694f4f 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 -- 2.30.2