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

Commit 4979af18 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Don't read test mapping list in Make" am: 2feb102e 

Original change: https://android-review.googlesource.com/c/platform/build/+/2506833



Change-Id: I17d985e486d475539dcb24d01594e47a48d0621f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0aa18ed 2feb102e

core/tasks/test_mapping.mk

+6 −6
Original line number Original line Diff line number Diff line
@@ -21,17 +21,17 @@ 
intermediates := $(call intermediates-dir-for,PACKAGING,test_mapping)

intermediates := $(call intermediates-dir-for,PACKAGING,test_mapping)

test_mappings_zip := $(intermediates)/test_mappings.zip

test_mappings_zip := $(intermediates)/test_mappings.zip

test_mapping_list := $(OUT_DIR)/.module_paths/TEST_MAPPING.list

test_mapping_list := $(OUT_DIR)/.module_paths/TEST_MAPPING.list

test_mappings := $(file <$(test_mapping_list))

$(test_mappings_zip) : PRIVATE_test_mappings := $(subst $(newline),\n,$(test_mappings))

$(test_mappings_zip) : PRIVATE_all_disabled_presubmit_tests := $(ALL_DISABLED_PRESUBMIT_TESTS)

$(test_mappings_zip) : PRIVATE_all_disabled_presubmit_tests := $(ALL_DISABLED_PRESUBMIT_TESTS)

$(test_mappings_zip) : PRIVATE_test_mapping_list := $(test_mapping_list)





$(test_mappings_zip) : $(test_mappings) $(SOONG_ZIP)

$(test_mappings_zip) : .KATI_DEPFILE := $(test_mappings_zip).d

$(test_mappings_zip) : $(test_mapping_list) $(SOONG_ZIP)

	@echo "Building artifact to include TEST_MAPPING files and tests to skip in presubmit check."

	@echo "Building artifact to include TEST_MAPPING files and tests to skip in presubmit check."

	rm -rf $@ $(dir $@)/disabled-presubmit-tests

	rm -rf $@ $(dir $@)/disabled-presubmit-tests

	echo $(sort $(PRIVATE_all_disabled_presubmit_tests)) | tr " " "\n" > $(dir $@)/disabled-presubmit-tests

	echo $(sort $(PRIVATE_all_disabled_presubmit_tests)) | tr " " "\n" > $(dir $@)/disabled-presubmit-tests

	echo -e "$(PRIVATE_test_mappings)" > $@.list

	$(SOONG_ZIP) -o $@ -C . -l $(PRIVATE_test_mapping_list) -C $(dir $@) -f $(dir $@)/disabled-presubmit-tests

	$(SOONG_ZIP) -o $@ -C . -l $@.list -C $(dir $@) -f $(dir $@)/disabled-presubmit-tests

	echo "$@ : " $$(cat $(PRIVATE_test_mapping_list)) > $@.d

	rm -f $@.list $(dir $@)/disabled-presubmit-tests

	rm -f $(dir $@)/disabled-presubmit-tests





test_mapping : $(test_mappings_zip)

test_mapping : $(test_mappings_zip)