liblog: test: ARM64: Enable 32 and 64-bit liblog_benchmark

- Enable build for 32 and 64 bit benchmark executables
- Fix some cosmetics issues in logd_write.c

Change-Id: I544446e5116607d7fec89171135f6e1eff6aebd8
This commit is contained in:
Mark Salyzyn 2015-02-04 12:28:47 -08:00
parent 0d385d1c62
commit 53016d8949
2 changed files with 5 additions and 5 deletions

View file

@ -73,6 +73,7 @@ static int pstore_fd = -1;
static enum {
kLogUninitialized, kLogNotAvailable, kLogAvailable
} g_log_status = kLogUninitialized;
int __android_log_dev_available(void)
{
if (g_log_status == kLogUninitialized) {
@ -145,7 +146,7 @@ static int __write_to_log_initialize()
return ret;
}
static int __write_to_log_kernel(log_id_t log_id, struct iovec *vec, size_t nr)
static int __write_to_log_daemon(log_id_t log_id, struct iovec *vec, size_t nr)
{
ssize_t ret;
#if FAKE_LOG_DEVICE
@ -180,7 +181,7 @@ static int __write_to_log_kernel(log_id_t log_id, struct iovec *vec, size_t nr)
}
/*
* struct {
* // whate we provire to pstore
* // what we provide to pstore
* android_pmsg_log_header_t pmsg_header;
* // what we provide to socket
* android_log_header_t header;
@ -321,7 +322,7 @@ static int __write_to_log_init(log_id_t log_id, struct iovec *vec, size_t nr)
return ret;
}
write_to_log = __write_to_log_kernel;
write_to_log = __write_to_log_daemon;
}
#if !defined(_WIN32)

View file

@ -43,8 +43,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += $(benchmark_c_flags)
LOCAL_SHARED_LIBRARIES += liblog libm
LOCAL_SRC_FILES := $(benchmark_src_files)
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
include $(BUILD_EXECUTABLE)
include $(BUILD_NATIVE_TEST)
# -----------------------------------------------------------------------------
# Unit tests.