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

Commit 33e87e3f authored by Luca Farsi's avatar Luca Farsi Committed by Automerger Merge Worker
Browse files

Merge "Split out host shared libs target from device-tests" into main am: ccd39a1f 

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



Change-Id: I7ed806751a7f6828b2d8a1bb51adaefff49c3dec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c80dc37 ccd39a1f

core/tasks/device-tests.mk

+17 −8
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 




.PHONY: device-tests

.PHONY: device-tests-host-shared-libs



device-tests-zip := $(PRODUCT_OUT)/device-tests.zip

# Create an artifact to include a list of test config files in device-tests.
@@ -23,37 +24,45 @@ device-tests-configs-zip := $(PRODUCT_OUT)/device-tests_configs.zip 
my_host_shared_lib_for_device_tests := $(call copy-many-files,$(COMPATIBILITY.device-tests.HOST_SHARED_LIBRARY.FILES))

device_tests_host_shared_libs_zip := $(PRODUCT_OUT)/device-tests_host-shared-libs.zip



$(device-tests-zip) : .KATI_IMPLICIT_OUTPUTS := $(device-tests-list-zip) $(device-tests-configs-zip) $(device_tests_host_shared_libs_zip)

$(device-tests-zip) : .KATI_IMPLICIT_OUTPUTS := $(device-tests-list-zip) $(device-tests-configs-zip)

$(device-tests-zip) : PRIVATE_device_tests_list := $(PRODUCT_OUT)/device-tests_list

$(device-tests-zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_device_tests)

$(device-tests-zip) : PRIVATE_device_host_shared_libs_zip := $(device_tests_host_shared_libs_zip)

$(device-tests-zip) : $(COMPATIBILITY.device-tests.FILES) $(COMPATIBILITY.device-tests.SOONG_INSTALLED_COMPATIBILITY_SUPPORT_FILES) $(my_host_shared_lib_for_device_tests) $(SOONG_ZIP)

	rm -f $@-shared-libs.list

	echo $(sort $(COMPATIBILITY.device-tests.FILES) $(COMPATIBILITY.device-tests.SOONG_INSTALLED_COMPATIBILITY_SUPPORT_FILES)) | tr " " "\n" > $@.list

	grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true

	grep -e .*\\.config$$ $@-host.list > $@-host-test-configs.list || true

	$(hide) for shared_lib in $(PRIVATE_HOST_SHARED_LIBS); do \

	  echo $$shared_lib >> $@-host.list; \

	  echo $$shared_lib >> $@-shared-libs.list; \

	done

	grep $(HOST_OUT_TESTCASES) $@-shared-libs.list > $@-host-shared-libs.list || true

	grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true

	grep -e .*\\.config$$ $@-target.list > $@-target-test-configs.list || true

	$(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.list -P target -C $(PRODUCT_OUT) -l $@-target.list -sha256

	$(hide) $(SOONG_ZIP) -d -o $(device-tests-configs-zip) \

	  -P host -C $(HOST_OUT) -l $@-host-test-configs.list \

	  -P target -C $(PRODUCT_OUT) -l $@-target-test-configs.list

	$(SOONG_ZIP) -d -o $(PRIVATE_device_host_shared_libs_zip) \

	  -P host -C $(HOST_OUT) -l $@-host-shared-libs.list

	rm -f $(PRIVATE_device_tests_list)

	$(hide) grep -e .*\\.config$$ $@-host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_device_tests_list)

	$(hide) grep -e .*\\.config$$ $@-target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_device_tests_list)

	$(hide) $(SOONG_ZIP) -d -o $(device-tests-list-zip) -C $(dir $@) -f $(PRIVATE_device_tests_list)

	rm -f $@.list $@-host.list $@-target.list $@-host-test-configs.list $@-target-test-configs.list \

	  $@-shared-libs.list $@-host-shared-libs.list $(PRIVATE_device_tests_list)

		$(PRIVATE_device_tests_list)



$(device_tests_host_shared_libs_zip) : PRIVATE_device_host_shared_libs_zip := $(device_tests_host_shared_libs_zip)

$(device_tests_host_shared_libs_zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_device_tests)

$(device_tests_host_shared_libs_zip) : $(my_host_shared_lib_for_device_tests) $(SOONG_ZIP)

	rm -f $@-shared-libs.list

	$(hide) for shared_lib in $(PRIVATE_HOST_SHARED_LIBS); do \

	  echo $$shared_lib >> $@-shared-libs.list; \

	done

	grep $(HOST_OUT_TESTCASES) $@-shared-libs.list > $@-host-shared-libs.list || true

	$(SOONG_ZIP) -d -o $(PRIVATE_device_host_shared_libs_zip) \

	  -P host -C $(HOST_OUT) -l $@-host-shared-libs.list



device-tests: $(device-tests-zip)

device-tests-host-shared-libs: $(device_tests_host_shared_libs_zip)



$(call dist-for-goals, device-tests, $(device-tests-zip) $(device-tests-list-zip) $(device-tests-configs-zip) $(device_tests_host_shared_libs_zip))

$(call dist-for-goals, device-tests-host-shared-libs, $(device_tests_host_shared_libs_zip))



$(call declare-1p-container,$(device-tests-zip),)

$(call declare-container-license-deps,$(device-tests-zip),$(COMPATIBILITY.device-tests.FILES) $(my_host_shared_lib_for_device_tests),$(PRODUCT_OUT)/:/)