diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-03-15 21:05:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-15 21:05:51 +0000 |
| commit | ccd830adad7c1723331b6f3d2122b910088dd377 (patch) | |
| tree | 39203598c6692aa80412d37e48276f610583a838 | |
| parent | 22377569bbac6621a47a478856799588c5f5a3b6 (diff) | |
| parent | 1ba8eb6bf8efb4bd3c2bec6ff8ffd8ae6ee91ac8 (diff) | |
| download | system_core-ccd830adad7c1723331b6f3d2122b910088dd377.zip system_core-ccd830adad7c1723331b6f3d2122b910088dd377.tar.gz system_core-ccd830adad7c1723331b6f3d2122b910088dd377.tar.bz2 | |
am 1ba8eb6b: am 8e012107: Merge "Fix the build"
* commit '1ba8eb6bf8efb4bd3c2bec6ff8ffd8ae6ee91ac8':
Fix the build
| -rw-r--r-- | liblog/Android.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/liblog/Android.mk b/liblog/Android.mk index 54e0b92..a4c52e7 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk @@ -61,7 +61,10 @@ endif # ======================================================== 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) @@ -77,7 +80,10 @@ include $(BUILD_HOST_SHARED_LIBRARY) 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) |