Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0c693ff authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge changes from topic 'build-vts-zip' 

* changes:
  delete vts.mk (which is moved to test/vts)
  include VTS packaging task files
parents 1a4a0a45 18a316c1

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2471,6 +2471,7 @@ include $(sort $(wildcard $(BUILD_SYSTEM)/tasks/*.mk)) 
-include $(sort $(wildcard product/*/*/build/tasks/*.mk))

# Also add test specifc tasks

include $(sort $(wildcard platform_testing/build/tasks/*.mk))

include $(sort $(wildcard test/vts/tools/build/tasks/*.mk))

endif



include $(BUILD_SYSTEM)/product-graph.mk

core/tasks/vts.mk

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
# 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))