ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

frameworks/native: link host libutils against external/zlib

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

Change-Id: Id6805d3c9071e6fa0559024336642b5386cf3c52
This commit is contained in:
Colin Cross 2012-03-23 10:14:56 -07:00
parent 163d5a9fa7
commit 1c6cd3803e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/utils/Android.mk
View File

@ -68,6 +68,9 @@ endif
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(commonSources) LOCAL_SRC_FILES:= $(commonSources)
LOCAL_MODULE:= libutils LOCAL_MODULE:= libutils
LOCAL_STATIC_LIBRARIES := libz
LOCAL_C_INCLUDES := \
external/zlib
LOCAL_CFLAGS += $(host_commonCflags) LOCAL_CFLAGS += $(host_commonCflags)
LOCAL_LDLIBS += $(host_commonLdlibs) LOCAL_LDLIBS += $(host_commonLdlibs)
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
@ -78,6 +81,9 @@ include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(commonSources) LOCAL_SRC_FILES:= $(commonSources)
LOCAL_MODULE:= lib64utils LOCAL_MODULE:= lib64utils
LOCAL_STATIC_LIBRARIES := libz
LOCAL_C_INCLUDES := \
external/zlib
LOCAL_CFLAGS += $(host_commonCflags) -m64 LOCAL_CFLAGS += $(host_commonCflags) -m64
LOCAL_LDLIBS += $(host_commonLdlibs) LOCAL_LDLIBS += $(host_commonLdlibs)
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)