commit 97069b07c39e29c2a784c5636730bd3681847b07
author Guang Zhu <guangzhu@google.com> Tue Apr 12 13:06:20 2016 -0700
committer Guang Zhu <guangzhu@google.com> Tue Apr 12 13:06:20 2016 -0700
tree 82eeadfa05f464b70c97d8fb4e445ad7a128578a
parent 748ea8acb07d727c18002058b8a07cf2f5861631
parent bc3720c69572391b7fbd9e2cf30a667ec1cc37e6

resolve merge conflicts of bc3720c to nyc-dev-plus-aosp

Change-Id: I2372a61a39131ede33cda95afc3c3ddd19e542f0

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index c3cd3c5..850e475 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -352,8 +352,10 @@
 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
 
@@ -362,8 +364,10 @@
 $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_APPS := $(TARGET_OUT_DATA_APPS)
 ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
 $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/nativetest/$(TARGET_2ND_ARCH)
+$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_METRIC_TESTS := $(TARGET_OUT_DATA)/benchmarktest/$(TARGET_2ND_ARCH)
 else
 $(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
 endif
 
 TARGET_OUT_CACHE := $(PRODUCT_OUT)/cache