From 60e8ff4d0d2a884e2d43e199fe6835d4c033f6d9 Mon Sep 17 00:00:00 2001
From: Dan Shi <dshi@google.com>
Date: Tue, 31 Mar 2020 20:34:10 +0000
Subject: [PATCH] Merge "Rename VTS to VTS10" am: 916be61b91 am: ed51dee98e am:
 474ebdd3e9 am: 371d7b5194

Bug: 151896491
Test: none

Change-Id: I6fc0004682299ac14d9d4f0e898eb9326812061f
Merged-In: I4ac161769068887e7575bb1f51a186a4efbe51d6
Merged-In: I6fc0004682299ac14d9d4f0e898eb9326812061f
(cherry picked from commit e8d9f8cd065a4ccc82576f6e4ee8665d10120c8f)
---
 core/ninja_config.mk                      | 2 +-
 core/tasks/general-tests.mk               | 2 ++
 target/board/generic_arm64/BoardConfig.mk | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/ninja_config.mk b/core/ninja_config.mk
index b1f4b0386..591937c0d 100644
--- a/core/ninja_config.mk
+++ b/core/ninja_config.mk
@@ -48,7 +48,7 @@ PARSE_TIME_MAKE_GOALS := \
 	user \
 	userdataimage \
 	userdebug \
-	vts \
+	vts10 \
 	win_sdk \
 	winsdk-tools
 
diff --git a/core/tasks/general-tests.mk b/core/tasks/general-tests.mk
index 7bcc91583..1cf7ef8cd 100644
--- a/core/tasks/general-tests.mk
+++ b/core/tasks/general-tests.mk
@@ -14,10 +14,12 @@
 
 .PHONY: general-tests
 
+# TODO(b/149249068): Remove vts10-tradefed.jar after all VTS tests are converted
 general_tests_tools := \
     $(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \
     $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \
     $(HOST_OUT_JAVA_LIBRARIES)/vts-core-tradefed.jar \
+    $(HOST_OUT_JAVA_LIBRARIES)/vts10-tradefed.jar
 
 intermediates_dir := $(call intermediates-dir-for,PACKAGING,general-tests)
 general_tests_zip := $(PRODUCT_OUT)/general-tests.zip
diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk
index 8f30e6d4e..a5264e43c 100644
--- a/target/board/generic_arm64/BoardConfig.mk
+++ b/target/board/generic_arm64/BoardConfig.mk
@@ -23,7 +23,7 @@ TARGET_2ND_ARCH := arm
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
 
-ifneq ($(TARGET_BUILD_APPS)$(filter cts sdk vts,$(MAKECMDGOALS)),)
+ifneq ($(TARGET_BUILD_APPS)$(filter cts sdk vts10,$(MAKECMDGOALS)),)
 # DO NOT USE
 # DO NOT USE
 #