commit bb7a92029486b4b5ee111a87206f3a0ce299fdc2
author Badash <badash@google.com> Wed Oct 04 07:45:40 2017 -0700
committer Ryan Longair <rlongair@google.com> Tue Dec 05 22:17:31 2017 +0000
tree a384815e52d8187faa9a62f1028b05bc0ff86249
parent b58800a22c230eeac0d2a6fe5ded7a76a95a4a5f

initial add sts to build

Test: Local build with other CLs in topic

Bug: 67456333
Change-Id: Ieea499fc22b6dff87dfb19fb8b9446fa449152ea
(cherry picked from commit a4560bb0cb23210b64f08276d16eaabbc57852d0)

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index f51070b..2cee683 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -78,6 +78,8 @@
 -include tools/tradefederation/build/suites/device-tests/config.mk
 # general-tests-specific-config.
 -include tools/tradefederation/build/suites/general-tests/config.mk
+# STS-specific config.
+-include test/sts/tools/sts-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