diff options
| author | Badash <badash@google.com> | 2017-10-18 23:09:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-18 23:09:49 +0000 |
| commit | cf5f702e19e4260b55fb1a81936fc8450a92b5eb (patch) | |
| tree | 65b305c92325ae3c0006168092ccefc5ae1dfeb6 | |
| parent | ad27175d179a5df6d3a732ba20fd63a14f5c47f2 (diff) | |
| parent | 5a37ad8d6b7b4ff145163899d698fcd6fda4f86f (diff) | |
| download | build-cf5f702e19e4260b55fb1a81936fc8450a92b5eb.tar.gz | |
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 a612f835d5..5a054a03c0 100644 --- a/core/main.mk +++ b/core/main.mk @@ -135,6 +135,8 @@ endif -include cts/build/config.mk # VTS-specific config. -include test/vts/tools/vts-tradefed/build/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 diff --git a/core/tasks/sts.mk b/core/tasks/sts.mk new file mode 100644 index 0000000000..b3c3baa462 --- /dev/null +++ b/core/tasks/sts.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 := sts +test_suite_tradefed := sts-tradefed +test_suite_readme := test/sts/README.md + +include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk + +.PHONY: sts +sts: $(compatibility_zip) +$(call dist-for-goals, sts, $(compatibility_zip)) |