StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Create build artifact tradefed-tests_list.zip" am: 8c2007cf4d am: f23aa88514

Browse Source 
am: 638fdf443b

Change-Id: I1074927c7be948f1df712f298b2487d3ea66f9d8
This commit is contained in:
Dan Shi
2017-12-15 23:40:12 +00:00
committed by android-build-merger
parent 8220e0165b 638fdf443b
commit d65958bf80
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/tasks/tradefed-tests-list.mk
View File

@@ -19,12 +19,12 @@ tradefed_tests :=
$(foreach dir, $(COMPATIBILITY.tradefed_tests_dir), \ $(foreach dir, $(COMPATIBILITY.tradefed_tests_dir), \
$(eval tradefed_tests += $(shell find $(dir) -type f -name "*.xml"))) $(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_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 := all_tests :=
$(foreach test, $(tradefed_tests), \ $(foreach test, $(tradefed_tests), \
$(eval all_tests += $(word 2,$(subst /res/config/,$(space),$(test))))) $(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 := $(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) $(tradefed_tests_list_zip) : $(tradefed_tests) $(SOONG_ZIP)
@echo "Package: $@" @echo "Package: $@"
@@ -34,3 +34,5 @@ $(tradefed_tests_list_zip) : $(tradefed_tests) $(SOONG_ZIP)
tradefed-tests-list : $(tradefed_tests_list_zip) tradefed-tests-list : $(tradefed_tests_list_zip)
$(call dist-for-goals, tradefed-tests-list, $(tradefed_tests_list_zip)) $(call dist-for-goals, tradefed-tests-list, $(tradefed_tests_list_zip))
tests: tradefed-tests-list