ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 1ba8eb6b: am 8e012107: Merge "Fix the build"

Browse source 
* commit '1ba8eb6bf8efb4bd3c2bec6ff8ffd8ae6ee91ac8':
  Fix the build
This commit is contained in:
Brian Carlstrom 2014-03-15 21:05:51 +00:00 • committed by Android Git Automerger
commit ccd830adad
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
liblog/Android.mk
View file

@ -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)