diff options
| author | Colin Cross <ccross@android.com> | 2012-03-23 10:14:56 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-03-23 10:14:56 -0700 |
| commit | 1c6cd3803e405251fce50cc5e501821171fbfafb (patch) | |
| tree | 1ad1ae2cdafc2097208c5cd719dc01e2cb72b555 /libs/utils | |
| parent | 163d5a9fa742e6a39f058fb9ed726fc31f4ecb28 (diff) | |
| download | frameworks_native-1c6cd3803e405251fce50cc5e501821171fbfafb.tar.gz frameworks_native-1c6cd3803e405251fce50cc5e501821171fbfafb.tar.bz2 frameworks_native-1c6cd3803e405251fce50cc5e501821171fbfafb.zip | |
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
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk index a5a59d8e3..5df630df7 100644 --- a/libs/utils/Android.mk +++ b/libs/utils/Android.mk @@ -68,6 +68,9 @@ endif 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 $(BUILD_HOST_STATIC_LIBRARY) 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) |