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

Commit b0d376f6 authored by Colin Cross's avatar Colin Cross
Browse files

Add tools jars to general-tests.zip 

Some non-tests were marked with
LOCAL_COMPATIBILITY_SUITE := general-tests
in order to get them into general-tests.zip. Soong is attempting to
only allow the test_suites property on tests.  Specify the tools
needed in the test suite in general-tests.mk instead, the same
way cts.mk does.

Bug: 112654980
Test: m checkbuild
Test: tradefed/general_tests_zip
Change-Id: Ied7a6b2f956b84659c3edcf4dd866a8cd936bedf
parent 38f16dcf

core/tasks/general-tests.mk

+10 −2
Original line number Diff line number Diff line
@@ -14,20 +14,27 @@ 


.PHONY: general-tests



general_tests_tools := \

    $(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \

    $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \



intermediates_dir := $(call intermediates-dir-for,PACKAGING,general-tests)

general_tests_zip := $(PRODUCT_OUT)/general-tests.zip

# Create an artifact to include a list of test config files in general-tests.

general_tests_list_zip := $(PRODUCT_OUT)/general-tests_list.zip

$(general_tests_zip) : PRIVATE_general_tests_list_zip := $(general_tests_list_zip)

$(general_tests_zip) : .KATI_IMPLICIT_OUTPUTS := $(general_tests_list_zip)

$(general_tests_zip) : PRIVATE_TOOLS := $(general_tests_tools)

$(general_tests_zip) : PRIVATE_INTERMEDIATES_DIR := $(intermediates_dir)

$(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(SOONG_ZIP)

$(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(general_tests_tools) $(SOONG_ZIP)

	rm -rf $(PRIVATE_INTERMEDIATES_DIR)

	mkdir -p $(PRIVATE_INTERMEDIATES_DIR)

	mkdir -p $(PRIVATE_INTERMEDIATES_DIR) $(PRIVATE_INTERMEDIATES_DIR)/tools

	echo $(sort $(COMPATIBILITY.general-tests.FILES)) | tr " " "\n" > $(PRIVATE_INTERMEDIATES_DIR)/list

	grep $(HOST_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/list > $(PRIVATE_INTERMEDIATES_DIR)/host.list || true

	grep $(TARGET_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/list > $(PRIVATE_INTERMEDIATES_DIR)/target.list || true

	cp -fp $(PRIVATE_TOOLS) $(PRIVATE_INTERMEDIATES_DIR)/tools/

	$(SOONG_ZIP) -d -o $@ \

	  -P host -C $(PRIVATE_INTERMEDIATES_DIR) -D $(PRIVATE_INTERMEDIATES_DIR)/tools \

	  -P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host.list \

	  -P target -C $(PRODUCT_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/target.list

	grep -e .*.config$$ $(PRIVATE_INTERMEDIATES_DIR)/host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_INTERMEDIATES_DIR)/general-tests_list
@@ -38,5 +45,6 @@ general-tests: $(general_tests_zip) 
$(call dist-for-goals, general-tests, $(general_tests_zip) $(general_tests_list_zip))



intermediates_dir :=

general_tests_tools :=

general_tests_zip :=

general_tests_list_zip :=