commit 8299ff701b66caf513e6cc8807b413bf44b8c2f6
author Mark Salyzyn <salyzyn@google.com> Mon Mar 17 15:46:19 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 17 15:46:19 2014 +0000
tree 67ff4da785ba80b62e0b8d0a51d1ac7f566667db
parent a4961e66b539d69b7656d93db05371b20efc8f3b
parent 0aff05eb8c23eefb770eb1ecd93e1d39dbab52f5

Merge "init: 64-bit build issue" into klp-volantis-dev

liblog/Android.mk

diff --git a/liblog/Android.mk b/liblog/Android.mk
index 54e0b92..a23de2d 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -61,14 +61,19 @@
 # ========================================================
 LOCAL_MODULE := liblog
 LOCAL_SRC_FILES := $(liblog_host_sources)
-LOCAL_LDLIBS := -lpthread -lrt
+LOCAL_LDLIBS := -lpthread
+ifeq ($(strip $(HOST_OS)),linux)
+LOCAL_LDLIBS += -lrt
+endif
 LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := liblog
 LOCAL_WHOLE_STATIC_LIBRARIES := liblog
+ifeq ($(strip $(HOST_OS)),linux)
 LOCAL_LDLIBS := -lrt
+endif
 include $(BUILD_HOST_SHARED_LIBRARY)
 
 
@@ -77,7 +82,10 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := lib64log
 LOCAL_SRC_FILES := $(liblog_host_sources)
-LOCAL_LDLIBS := -lpthread -lrt
+LOCAL_LDLIBS := -lpthread
+ifeq ($(strip $(HOST_OS)),linux)
+LOCAL_LDLIBS += -lrt
+endif
 LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -m64
 include $(BUILD_HOST_STATIC_LIBRARY)