summaryrefslogtreecommitdiffstats
path: root/Android.common.mk
diff options
context:
space:
mode:
authorRob Herring <[email protected]>2017-03-21 13:51:18 -0500
committerEmil Velikov <[email protected]>2017-03-22 17:52:35 +0000
commit6bfad7c659f94d30d68b14f6181495653124cf29 (patch)
tree139b8d3d3fad32b9b5ba0ae27d12fa89e7635ca1 /Android.common.mk
parent6f8f97a9b24f4ff33d7e181a695f6a0e4954db6d (diff)
Android: fix libz dependency for host targets
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 <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'Android.common.mk')
-rw-r--r--Android.common.mk2
1 files changed, 2 insertions, 0 deletions
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