Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e012107 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

Merge "Fix the build"

parents 7ad09634 dc507769

liblog/Android.mk

+8 −2
Original line number Diff line number Diff line
@@ -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)