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

Commit bc3720c6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Benchmark have their own folder" into nyc-dev

parents 18c202a7 188a1dd1

core/envsetup.mk

+3 −0
Original line number Diff line number Diff line
@@ -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

core/native_benchmark.mk

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