From 984c129c841741d48cce4868af00c0d904377c43 Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Wed, 18 Mar 2020 22:42:00 -0700 Subject: [PATCH] Rename VTS to VTS10 Bug: 151896491 Test: m -j vts10 Change-Id: I7b70b13401678d70e4b46f9e7eb9d844bcfa315e --- android/vts_config.go | 4 ++-- ui/build/cleanbuild.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/android/vts_config.go b/android/vts_config.go index 9a1df7c99..77fb9fed9 100644 --- a/android/vts_config.go +++ b/android/vts_config.go @@ -53,7 +53,7 @@ func (me *VtsConfig) AndroidMk() AndroidMkData { fmt.Fprintf(w, "LOCAL_TEST_CONFIG := %s\n", *me.properties.Test_config) } - fmt.Fprintf(w, "LOCAL_COMPATIBILITY_SUITE := vts %s\n", + fmt.Fprintf(w, "LOCAL_COMPATIBILITY_SUITE := vts10 %s\n", strings.Join(me.properties.Test_suites, " ")) }, } @@ -64,7 +64,7 @@ func InitVtsConfigModule(me *VtsConfig) { me.AddProperties(&me.properties) } -// vts_config generates a Vendor Test Suite (VTS) configuration file from the +// vts_config generates a Vendor Test Suite (VTS10) configuration file from the // xml file and stores it in a subdirectory of $(HOST_OUT). func VtsConfigFactory() Module { module := &VtsConfig{} diff --git a/ui/build/cleanbuild.go b/ui/build/cleanbuild.go index 95d049aed..0bcdccb7b 100644 --- a/ui/build/cleanbuild.go +++ b/ui/build/cleanbuild.go @@ -99,6 +99,7 @@ func installClean(ctx Context, config Config, what int) { hostOut("sdk_addon"), hostOut("testcases"), hostOut("vts"), + hostOut("vts10"), hostOut("vts-core"), productOut("*.img"), productOut("*.zip"),