Android: correct libz dependency
authorChih-Wei Huang <cwhuang@android-x86.org>
Wed, 17 May 2017 05:10:02 +0000 (13:10 +0800)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 17 May 2017 13:04:18 +0000 (14:04 +0100)
commitbfc0c23843008fd510afa263ebe371bef3346445
tree5437b048730507688e9eb70f9e82c2d054d2a331
parentf96edf72b49348176b5eea0bdfe114e260dd3f99
Android: correct libz dependency

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 <cwhuang@linux.org.tw>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Android.common.mk
src/gallium/targets/dri/Android.mk
src/intel/Android.vulkan.mk
src/mesa/drivers/dri/Android.mk
src/util/Android.mk