generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 5d428bba: Merge "Do not build host benchmark code on macs."

Browse Source 
* commit '5d428bbab4d5a1124186a75bef6a4fb008682e43':
  Do not build host benchmark code on macs.
This commit is contained in:
Christopher Ferris 2015-01-27 01:37:45 +00:00 committed by Android Git Automerger
commit 85ecef2c6b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
benchmarks/Android.mk
View File

@ -28,6 +28,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# Only supported on linux systems.
ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libbenchmark LOCAL_MODULE := libbenchmark
LOCAL_CFLAGS += -O2 -Wall -Wextra -Werror LOCAL_CFLAGS += -O2 -Wall -Wextra -Werror
@ -37,6 +40,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Benchmarks. # Benchmarks.
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -76,6 +81,9 @@ include $(BUILD_EXECUTABLE)
# performance of the old release's libc, and a static benchmark isn't # performance of the old release's libc, and a static benchmark isn't
# going to let you do that. # going to let you do that.
# Only supported on linux systems.
ifeq ($(HOST_OS),linux)
# Build benchmarks for the host (against glibc!). Run with: # Build benchmarks for the host (against glibc!). Run with:
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := bionic-benchmarks-glibc LOCAL_MODULE := bionic-benchmarks-glibc
@ -88,6 +96,8 @@ LOCAL_SRC_FILES := $(benchmark_src_files)
LOCAL_STATIC_LIBRARIES += libbenchmark LOCAL_STATIC_LIBRARIES += libbenchmark
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
endif
ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64)) ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))
include $(LOCAL_PATH)/../build/run-on-host.mk include $(LOCAL_PATH)/../build/run-on-host.mk