From bfc0c23843008fd510afa263ebe371bef3346445 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Wed, 17 May 2017 13:10:02 +0800 Subject: Android: correct libz dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 6facb0c0 ("android: fix libz dynamic library dependencies") unconditionally adds libz as a dependency to all shared libraries. That is unnecessary. Commit 85a9b1b5 introduced libz as a dependency to libmesa_util. So only the shared libraries that use libmesa_util need libz. Fix Android Lollipop build by adding the include path of zlib to libmesa_util explicitly instead of getting the path implicitly from zlib since it doesn't export the include path in Lollipop. Fixes: 6facb0c0 "android: fix libz dynamic library dependencies" Signed-off-by: Chih-Wei Huang Reviewed-by: Tapani Pälli Reviewed-by: Rob Herring --- src/mesa/drivers/dri/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mesa') diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk index d4fb670f84c..53ff4b4f632 100644 --- a/src/mesa/drivers/dri/Android.mk +++ b/src/mesa/drivers/dri/Android.mk @@ -51,7 +51,8 @@ MESA_DRI_SHARED_LIBRARIES := \ libdl \ libexpat \ libglapi \ - liblog + liblog \ + libz #----------------------------------------------- # Build drivers and libmesa_dri_common -- cgit v1.2.3