summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2015-01-27 01:32:06 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-27 01:32:06 +0000
commit5d428bbab4d5a1124186a75bef6a4fb008682e43 (patch)
treea2d386ccc18ec55c0ef1a86c0990f116ddf36399
parent0e6af17a35b1e5e6e8c4a22dcb934bb641a92488 (diff)
parent941a1a191fc86893a7ef48926c788eb32ffa81da (diff)
downloadbionic-5d428bbab4d5a1124186a75bef6a4fb008682e43.zip
bionic-5d428bbab4d5a1124186a75bef6a4fb008682e43.tar.gz
bionic-5d428bbab4d5a1124186a75bef6a4fb008682e43.tar.bz2
Merge "Do not build host benchmark code on macs."
-rw-r--r--benchmarks/Android.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index 989e9e6..c3eb6d3 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -28,6 +28,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
include $(BUILD_STATIC_LIBRARY)
+# Only supported on linux systems.
+ifeq ($(HOST_OS),linux)
+
include $(CLEAR_VARS)
LOCAL_MODULE := libbenchmark
LOCAL_CFLAGS += -O2 -Wall -Wextra -Werror
@@ -37,6 +40,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)
+endif
+
# -----------------------------------------------------------------------------
# Benchmarks.
# -----------------------------------------------------------------------------
@@ -76,6 +81,9 @@ include $(BUILD_EXECUTABLE)
# performance of the old release's libc, and a static benchmark isn't
# going to let you do that.
+# Only supported on linux systems.
+ifeq ($(HOST_OS),linux)
+
# Build benchmarks for the host (against glibc!). Run with:
include $(CLEAR_VARS)
LOCAL_MODULE := bionic-benchmarks-glibc
@@ -88,6 +96,8 @@ LOCAL_SRC_FILES := $(benchmark_src_files)
LOCAL_STATIC_LIBRARIES += libbenchmark
include $(BUILD_HOST_EXECUTABLE)
+endif
+
ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))
include $(LOCAL_PATH)/../build/run-on-host.mk