From 6bfad7c659f94d30d68b14f6181495653124cf29 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 21 Mar 2017 13:51:18 -0500 Subject: [PATCH] Android: fix libz dependency for host targets MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit 6facb0c08fa1 ("android: fix libz dynamic library dependencies") added libz as a dependency, but this breaks host targets as the host dependency is libz-host. As no host lib needs libz, just remove the dependency for them. Fixes: 6facb0c08fa1 "android: fix libz dynamic library dependencies" Signed-off-by: Rob Herring Reviewed-by: Tapani Pälli Reviewed-by: Emil Velikov --- Android.common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Android.common.mk b/Android.common.mk index 0130c585aed..062f8328d87 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -126,4 +126,6 @@ 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 -- 2.30.2