diff options
| author | Chih-Wei Huang <[email protected]> | 2017-05-17 13:10:02 +0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-18 18:01:44 +0100 |
| commit | 5cace16ac6f40bd6f6a685348d668f39c47755bc (patch) | |
| tree | b5656393dbd5ab0761699ca416fe36b1629a4a30 | |
| parent | d6439cb2975aebd2be03e032fbeea86328159074 (diff) | |
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 <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
(cherry picked from commit bfc0c23843008fd510afa263ebe371bef3346445)
| -rw-r--r-- | Android.common.mk | 4 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 3 | ||||
| -rw-r--r-- | src/intel/Android.vulkan.mk | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Android.mk | 3 | ||||
| -rw-r--r-- | src/util/Android.mk | 1 |
5 files changed, 6 insertions, 7 deletions
diff --git a/Android.common.mk b/Android.common.mk index 34db6770c5b..8acb0cc31fe 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -116,7 +116,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 2385e8bf4f9..0a137a5246d 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 ifneq ($(filter freedreno,$(MESA_GPU_DRIVERS)),) LOCAL_CFLAGS += -DGALLIUM_FREEDRENO 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 72a5593fefa..dc13f71f094 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 \ |