From bfc0c23843008fd510afa263ebe371bef3346445 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Wed, 17 May 2017 13:10:02 +0800 Subject: [PATCH] Android: correct libz dependency MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 --- Android.common.mk | 4 ---- src/gallium/targets/dri/Android.mk | 3 ++- src/intel/Android.vulkan.mk | 2 +- src/mesa/drivers/dri/Android.mk | 3 ++- src/util/Android.mk | 1 + 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Android.common.mk b/Android.common.mk index 5e7fd9445ad..a79c33149dd 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -103,7 +103,3 @@ endif # Quiet down the build system and remove any .h files from the sources LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES)) - -ifneq ($(LOCAL_IS_HOST_MODULE),true) -LOCAL_SHARED_LIBRARIES += libz -endif diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index f72551c51cb..8c8fb5d3d1c 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -35,7 +35,8 @@ LOCAL_CFLAGS := LOCAL_SHARED_LIBRARIES := \ libdl \ libglapi \ - libexpat + libexpat \ + libz $(foreach d, $(MESA_BUILD_GALLIUM), $(eval LOCAL_CFLAGS += $(patsubst HAVE_%,-D%,$(d)))) diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk index 831b6584dc8..2bf56a41e97 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -231,7 +231,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_intel_compiler \ libmesa_anv_entrypoints -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := libdrm libz include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) 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 diff --git a/src/util/Android.mk b/src/util/Android.mk index 64aafbe2ee1..facdcf8ed11 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -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 \ -- 2.30.2