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>

This commit is contained in:

Chih-Wei Huang

2017-05-17 13:10:02 +08:00

committed by

Emil Velikov

parent f96edf72b4

commit bfc0c23843

5 changed files with 6 additions and 7 deletions

									
										src/util/Android.mk
									
		+1
		
												View File
												
				@@ -34,6 +34,7 @@ LOCAL_SRC_FILES := \

					$(MESA_UTIL_FILES)

				LOCAL_C_INCLUDES := \

					external/zlib \

					$(MESA_TOP)/src/mesa \

					$(MESA_TOP)/src/mapi \

					$(MESA_TOP)/src/gallium/include \