commit e6bde89d1b386d8deced81afaec7a8c13e742e93
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 29 05:08:15 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Wed Apr 29 05:08:15 2020 -0700
tree 9914b1be502d7cab4d138df3abcc7c0b9ac2d283
parent 4e056fe1c44dc251443a44690230dbb4e91087ee
parent cc119b29610ca84568ad34b977b57d110edca4c2

Merge cc119b29610ca84568ad34b977b57d110edca4c2 on remote branch

Change-Id: I30d2eceaf56121549787a8e813b91aaa45c68c80

build/vtf.mk

diff --git a/build/vtf.mk b/build/vtf.mk
index 398a76b..b2abee5 100644
--- a/build/vtf.mk
+++ b/build/vtf.mk
@@ -26,16 +26,16 @@
   host-libprotobuf-java-full \
   loganalysis \
   tradefed \
-  vts-core-tradefed \
   vts-tradefed \
-  vts-tradefed-tests \
+  vts10-tradefed \
+  vts10-tradefed-tests \
 
 vtf_tradefed_copy_pairs := \
   $(foreach f,$(vtf_tradefed_modules),\
     $(HOST_OUT)/framework/$(f).jar:$(VTF_TOOLS_OUT)/$(f).jar)
 
 vtf_tradefed_additional_deps_copy_pairs := \
-  test/vts/tools/vts-tradefed/etc/vts-tradefed:$(VTF_TOOLS_OUT)/vts-tradefed
+  test/vts/tools/vts-tradefed/etc/vts10-tradefed:$(VTF_TOOLS_OUT)/vts10-tradefed
 
 vtf_tradefed_additional_deps_copy_pairs += \
   $(foreach f,$(VTF_COPY_VTF_BINARY),\