From fdc95fe0ca82bf9579161681c4ff761798f1c16a Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Tue, 12 Dec 2017 13:42:33 -0800 Subject: [PATCH] Create build artifact tradefed-tests_list.zip Bug: 69678490 Test: m -j dist tradefed-tests-list Change-Id: Ie70228f4c128b23c5d169fc8baafc6507386b541 --- core/tasks/tradefed-tests-list.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/tasks/tradefed-tests-list.mk b/core/tasks/tradefed-tests-list.mk index 3b5f5da6b..bcbdfcf4c 100644 --- a/core/tasks/tradefed-tests-list.mk +++ b/core/tasks/tradefed-tests-list.mk @@ -19,12 +19,12 @@ tradefed_tests := $(foreach dir, $(COMPATIBILITY.tradefed_tests_dir), \ $(eval tradefed_tests += $(shell find $(dir) -type f -name "*.xml"))) tradefed_tests_list_intermediates := $(call intermediates-dir-for,PACKAGING,tradefed_tests_list,HOST,COMMON) -tradefed_tests_list_zip := $(tradefed_tests_list_intermediates)/tradefed-tests-list.zip +tradefed_tests_list_zip := $(tradefed_tests_list_intermediates)/tradefed-tests_list.zip all_tests := $(foreach test, $(tradefed_tests), \ $(eval all_tests += $(word 2,$(subst /res/config/,$(space),$(test))))) $(tradefed_tests_list_zip) : PRIVATE_tradefed_tests := $(subst .xml,,$(subst $(space),\n,$(sort $(all_tests)))) -$(tradefed_tests_list_zip) : PRIVATE_tradefed_tests_list := $(tradefed_tests_list_intermediates)/tradefed-tests-list +$(tradefed_tests_list_zip) : PRIVATE_tradefed_tests_list := $(tradefed_tests_list_intermediates)/tradefed-tests_list $(tradefed_tests_list_zip) : $(tradefed_tests) $(SOONG_ZIP) @echo "Package: $@" @@ -34,3 +34,5 @@ $(tradefed_tests_list_zip) : $(tradefed_tests) $(SOONG_ZIP) tradefed-tests-list : $(tradefed_tests_list_zip) $(call dist-for-goals, tradefed-tests-list, $(tradefed_tests_list_zip)) + +tests: tradefed-tests-list