commit e29b5c384b0dc7658ba320d1fba38a4a772e1bf1
author Colin Cross <ccross@android.com> Fri Mar 23 10:14:56 2012 -0700
committer Alex Ray <aray@google.com> Tue Jul 30 13:56:59 2013 -0700
tree 98de4c0d4f7c6927f591451434f6644c0b24bcd7
parent 3abdea92efbe85c66d7f2dc662953d0b5ed59451

frameworks/native: link host libutils against external/zlib

Fix the SDK build by statically linking host libutils against libz
from external/zlib.

Change-Id: Id6805d3c9071e6fa0559024336642b5386cf3c52

libs/utils/Android.mk

diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk
index a5a59d8..5df630d 100644
--- a/libs/utils/Android.mk
+++ b/libs/utils/Android.mk
@@ -68,6 +68,9 @@
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES:= $(commonSources)
 LOCAL_MODULE:= libutils
+LOCAL_STATIC_LIBRARIES := libz
+LOCAL_C_INCLUDES := \
+	external/zlib
 LOCAL_CFLAGS += $(host_commonCflags)
 LOCAL_LDLIBS += $(host_commonLdlibs)
 include $(BUILD_HOST_STATIC_LIBRARY)
@@ -78,6 +81,9 @@
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES:= $(commonSources)
 LOCAL_MODULE:= lib64utils
+LOCAL_STATIC_LIBRARIES := libz
+LOCAL_C_INCLUDES := \
+	external/zlib
 LOCAL_CFLAGS += $(host_commonCflags) -m64
 LOCAL_LDLIBS += $(host_commonLdlibs)
 include $(BUILD_HOST_STATIC_LIBRARY)