summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Tate2014-03-14 16:37:39 -0500
committerBrian Carlstrom2014-03-15 15:57:34 -0500
commitdc507769b5ee3eeac8d2948ea98f6d53857e9d1a (patch)
treed5f2367fe05e5d2e05e41b6cabe6b6a6f800cb8a /liblog/Android.mk
parent7ad096340fd5170267b12a6bd577e9d30353564f (diff)
downloadplatform-system-core-dc507769b5ee3eeac8d2948ea98f6d53857e9d1a.tar.gz
platform-system-core-dc507769b5ee3eeac8d2948ea98f6d53857e9d1a.tar.xz
platform-system-core-dc507769b5ee3eeac8d2948ea98f6d53857e9d1a.zip
Fix the build
(cherry-picked from commit 296dc446376e19d2ce995ae7bc886560523eca2d) Change-Id: I924f4796fbb70a0f45cc23a852e26e634c5b0e0e
Diffstat (limited to 'liblog/Android.mk')
-rw-r--r--liblog/Android.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/liblog/Android.mk b/liblog/Android.mk
index 54e0b92a0..a4c52e71e 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -61,7 +61,10 @@ endif
61# ======================================================== 61# ========================================================
62LOCAL_MODULE := liblog 62LOCAL_MODULE := liblog
63LOCAL_SRC_FILES := $(liblog_host_sources) 63LOCAL_SRC_FILES := $(liblog_host_sources)
64LOCAL_LDLIBS := -lpthread -lrt 64LOCAL_LDLIBS := -lpthread
65ifeq ($(strip $(HOST_OS)),linux)
66LOCAL_LDLIBS += -lrt
67endif
65LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 68LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1
66include $(BUILD_HOST_STATIC_LIBRARY) 69include $(BUILD_HOST_STATIC_LIBRARY)
67 70
@@ -77,7 +80,10 @@ include $(BUILD_HOST_SHARED_LIBRARY)
77include $(CLEAR_VARS) 80include $(CLEAR_VARS)
78LOCAL_MODULE := lib64log 81LOCAL_MODULE := lib64log
79LOCAL_SRC_FILES := $(liblog_host_sources) 82LOCAL_SRC_FILES := $(liblog_host_sources)
80LOCAL_LDLIBS := -lpthread -lrt 83LOCAL_LDLIBS := -lpthread
84ifeq ($(strip $(HOST_OS)),linux)
85LOCAL_LDLIBS += -lrt
86endif
81LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -m64 87LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -m64
82include $(BUILD_HOST_STATIC_LIBRARY) 88include $(BUILD_HOST_STATIC_LIBRARY)
83 89