From 172b7d421ef9a7dda6b7bedb3ceb0c87799bb528 Mon Sep 17 00:00:00 2001
From: Keun Soo Yim <yim@google.com>
Date: Wed, 24 Feb 2016 15:41:01 -0800
Subject: [PATCH] build file change for vts to use the existing cts-tradefed
 infrastructure

Mostly done by stuartscott@

Change-Id: I016405757f39df833d532bc01fd2237e5e961a8a
---
 core/main.mk      |  2 ++
 core/tasks/vts.mk | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 core/tasks/vts.mk

diff --git a/core/main.mk b/core/main.mk
index ae53c3723..5c2e3a172 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -137,6 +137,8 @@ endif
 
 # CTS-specific config.
 -include cts/build/config.mk
+# VTS-specific config.
+-include test/vts/tools/vts-tradefed/build/config.mk
 
 # This allows us to force a clean build - included after the config.mk
 # environment setup is done, but before we generate any dependencies.  This
diff --git a/core/tasks/vts.mk b/core/tasks/vts.mk
new file mode 100644
index 000000000..507f22ea8
--- /dev/null
+++ b/core/tasks/vts.mk
@@ -0,0 +1,23 @@
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+test_suite_name := vts
+test_suite_tradefed := vts-tradefed
+test_suite_readme := test/vts/README.md
+
+include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
+
+.PHONY: vts
+vts: $(compatibility_zip)
+$(call dist-for-goals, vts, $(compatibility_zip))