diff options
author | Badash | 2017-10-18 18:09:49 -0500 |
---|---|---|
committer | android-build-merger | 2017-10-18 18:09:49 -0500 |
commit | cf5f702e19e4260b55fb1a81936fc8450a92b5eb (patch) | |
tree | 65b305c92325ae3c0006168092ccefc5ae1dfeb6 | |
parent | ad27175d179a5df6d3a732ba20fd63a14f5c47f2 (diff) | |
parent | 5a37ad8d6b7b4ff145163899d698fcd6fda4f86f (diff) | |
download | platform-build-cf5f702e19e4260b55fb1a81936fc8450a92b5eb.tar.gz platform-build-cf5f702e19e4260b55fb1a81936fc8450a92b5eb.tar.xz platform-build-cf5f702e19e4260b55fb1a81936fc8450a92b5eb.zip |
Merge "DO NOT MERGE initial add sts to build" into nyc-dev am: b20486d397 am: 41a57745a4
am: 5a37ad8d6b
Change-Id: I79b340558af4720e32c12dba4e4712bb722b89cd
-rw-r--r-- | core/main.mk | 2 | ||||
-rw-r--r-- | core/tasks/sts.mk | 23 |
2 files changed, 25 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk index a612f835d..5a054a03c 100644 --- a/core/main.mk +++ b/core/main.mk | |||
@@ -135,6 +135,8 @@ endif | |||
135 | -include cts/build/config.mk | 135 | -include cts/build/config.mk |
136 | # VTS-specific config. | 136 | # VTS-specific config. |
137 | -include test/vts/tools/vts-tradefed/build/config.mk | 137 | -include test/vts/tools/vts-tradefed/build/config.mk |
138 | # STS-specific config. | ||
139 | -include test/sts/tools/sts-tradefed/build/config.mk | ||
138 | 140 | ||
139 | # This allows us to force a clean build - included after the config.mk | 141 | # This allows us to force a clean build - included after the config.mk |
140 | # environment setup is done, but before we generate any dependencies. This | 142 | # environment setup is done, but before we generate any dependencies. This |
diff --git a/core/tasks/sts.mk b/core/tasks/sts.mk new file mode 100644 index 000000000..b3c3baa46 --- /dev/null +++ b/core/tasks/sts.mk | |||
@@ -0,0 +1,23 @@ | |||
1 | # Copyright (C) 2016 The Android Open Source Project | ||
2 | # | ||
3 | # Licensed under the Apache License, Version 2.0 (the "License"); | ||
4 | # you may not use this file except in compliance with the License. | ||
5 | # You may obtain a copy of the License at | ||
6 | # | ||
7 | # http://www.apache.org/licenses/LICENSE-2.0 | ||
8 | # | ||
9 | # Unless required by applicable law or agreed to in writing, software | ||
10 | # distributed under the License is distributed on an "AS IS" BASIS, | ||
11 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
12 | # See the License for the specific language governing permissions and | ||
13 | # limitations under the License. | ||
14 | |||
15 | test_suite_name := sts | ||
16 | test_suite_tradefed := sts-tradefed | ||
17 | test_suite_readme := test/sts/README.md | ||
18 | |||
19 | include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk | ||
20 | |||
21 | .PHONY: sts | ||
22 | sts: $(compatibility_zip) | ||
23 | $(call dist-for-goals, sts, $(compatibility_zip)) | ||