From 188a1dd18fdde1a867910fb95896a121a562fcef Mon Sep 17 00:00:00 2001 From: Julien Desprez Date: Tue, 12 Apr 2016 10:22:06 +0100 Subject: [PATCH] Benchmark have their own folder Benchmark tests use a separate folder from native tests. Bug: 27465556 Change-Id: Ife0f43062e36ffc856f41683ddc4d91a7787333e --- core/envsetup.mk | 3 +++ core/native_benchmark.mk | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index e8fa6a76a3..0a72603372 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -343,8 +343,10 @@ TARGET_OUT_DATA_KEYCHARS := $(TARGET_OUT_KEYCHARS) TARGET_OUT_DATA_ETC := $(TARGET_OUT_ETC) ifeq ($(TARGET_IS_64_BIT),true) TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest64 +TARGET_OUT_DATA_METRIC_TESTS := $(TARGET_OUT_DATA)/benchmarktest64 else TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest +TARGET_OUT_DATA_METRIC_TESTS := $(TARGET_OUT_DATA)/benchmarktest endif TARGET_OUT_DATA_FAKE := $(TARGET_OUT_DATA)/fake_packages @@ -352,6 +354,7 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_EXECUTABLES := $(TARGET_OUT_DATA_EX $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_SHARED_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES) $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_APPS := $(TARGET_OUT_DATA_APPS) $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest +$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_METRIC_TESTS := $(TARGET_OUT_DATA)/benchmarktest TARGET_OUT_CACHE := $(PRODUCT_OUT)/cache diff --git a/core/native_benchmark.mk b/core/native_benchmark.mk index fe378b88a8..ac377011c2 100644 --- a/core/native_benchmark.mk +++ b/core/native_benchmark.mk @@ -5,8 +5,13 @@ LOCAL_STATIC_LIBRARIES += libgoogle-benchmark -ifndef LOCAL_MODULE_PATH -LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_METRIC_TESTS)/$(LOCAL_MODULE) +LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_METRIC_TESTS)/$(LOCAL_MODULE) + +ifndef LOCAL_MULTILIB +ifndef LOCAL_32_BIT_ONLY +LOCAL_MULTILIB := both +endif endif include $(BUILD_EXECUTABLE)