openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Revert "Add vts related artifacts to vts-core package" 

This reverts commit 5e06288e7c.

Bug: 149249068
Test: build

Change-Id: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05
Merged-In: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05
This commit is contained in:
Dan Shi 2020-05-07 09:02:26 -07:00
parent 60d03bd7db
commit a1082fb046
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/tasks/vts-core-tests.mk
View File

@ -12,15 +12,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
-include external/linux-kselftest/android/kselftest_test_list.mk
-include external/ltp/android/ltp_package_list.mk
test_suite_name := vts test_suite_name := vts
test_suite_tradefed := vts-tradefed test_suite_tradefed := vts-tradefed
test_suite_readme := test/vts/tools/vts-core-tradefed/README test_suite_readme := test/vts/tools/vts-core-tradefed/README
# TODO(b/149249068): Clean up after all VTS tests are converted.
vts_test_artifact_paths :=
# Some repo may not include vts project.
-include test/vts/tools/build/tasks/framework/vts_for_core_suite.mk
# Copy kernel test modules to testcases directories # Copy kernel test modules to testcases directories
kernel_test_host_out := $(HOST_OUT_TESTCASES)/vts_kernel_tests kernel_test_host_out := $(HOST_OUT_TESTCASES)/vts_kernel_tests
kernel_test_vts_out := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name)/testcases/vts_kernel_tests kernel_test_vts_out := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name)/testcases/vts_kernel_tests
@ -44,7 +42,6 @@ include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
$(compatibility_zip): $(copy_kernel_tests) $(compatibility_zip): $(copy_kernel_tests)
.PHONY: vts .PHONY: vts
$(compatibility_zip): $(vts_test_artifact_paths)
vts: $(compatibility_zip) vts: $(compatibility_zip)
$(call dist-for-goals, vts, $(compatibility_zip)) $(call dist-for-goals, vts, $(compatibility_zip))