From dec1d6e084633d5438bdd5b76193a87d1becf627 Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Wed, 18 Mar 2020 22:40:53 -0700 Subject: [PATCH] Rename VTS to VTS10 Bug: 151896491 Test: m -j vts10 Change-Id: I0a6468e63f381e67f34666975c18058d64048178 --- core/ninja_config.mk | 2 +- core/tasks/general-tests.mk | 4 ++-- target/board/generic_arm64/BoardConfig.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/ninja_config.mk b/core/ninja_config.mk index c2d2a5bda1..3f2e5de8e8 100644 --- a/core/ninja_config.mk +++ b/core/ninja_config.mk @@ -46,7 +46,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 53ebddc213..1cf7ef8cd2 100644 --- a/core/tasks/general-tests.mk +++ b/core/tasks/general-tests.mk @@ -14,12 +14,12 @@ .PHONY: general-tests -# TODO(b/149249068): Remove vts-tradefed.jar after all VTS tests are converted +# 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)/vts-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 8f30e6d4e2..a5264e43cf 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 #