Merge "Split out host shared libs target from general-tests" into main (ba6f6806) · Commits · e / os / android_build

core/tasks/general-tests-shared-libs.mk

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2024 The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.

		.PHONY: general-tests-shared-libs

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

		general_tests_shared_libs_zip := $(PRODUCT_OUT)/general-tests_host-shared-libs.zip

		# Filter shared entries between general-tests and device-tests's HOST_SHARED_LIBRARY.FILES,
		# to avoid warning about overriding commands.
		my_host_shared_lib_for_general_tests := \
		$(foreach m,$(filter $(COMPATIBILITY.device-tests.HOST_SHARED_LIBRARY.FILES),\
		$(COMPATIBILITY.general-tests.HOST_SHARED_LIBRARY.FILES)),$(call word-colon,2,$(m)))
		my_general_tests_shared_lib_files := \
		$(filter-out $(COMPATIBILITY.device-tests.HOST_SHARED_LIBRARY.FILES),\
		$(COMPATIBILITY.general-tests.HOST_SHARED_LIBRARY.FILES))

		my_host_shared_lib_for_general_tests += $(call copy-many-files,$(my_general_tests_shared_lib_files))

		$(general_tests_shared_libs_zip) : PRIVATE_INTERMEDIATES_DIR := $(intermediates_dir)
		$(general_tests_shared_libs_zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_general_tests)
		$(general_tests_shared_libs_zip) : PRIVATE_general_host_shared_libs_zip := $(general_tests_shared_libs_zip)
		$(general_tests_shared_libs_zip) : $(my_host_shared_lib_for_general_tests) $(SOONG_ZIP)
		rm -rf $(PRIVATE_INTERMEDIATES_DIR)
		mkdir -p $(PRIVATE_INTERMEDIATES_DIR) $(PRIVATE_INTERMEDIATES_DIR)/tools
		$(hide) for shared_lib in $(PRIVATE_HOST_SHARED_LIBS); do \
		echo $$shared_lib >> $(PRIVATE_INTERMEDIATES_DIR)/shared-libs.list; \
		done
		grep $(HOST_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/shared-libs.list > $(PRIVATE_INTERMEDIATES_DIR)/host-shared-libs.list \|\| true
		$(SOONG_ZIP) -d -o $(PRIVATE_general_host_shared_libs_zip) \
		-P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host-shared-libs.list

		general-tests-shared-libs: $(general_tests_shared_libs_zip)
		$(call dist-for-goals, general-tests-shared-libs, $(general_tests_shared_libs_zip))

		$(call declare-1p-container,$(general_tests_shared_libs_zip),)
		$(call declare-container-license-deps,$(general_tests_shared_libs_zip),$(my_host_shared_lib_for_general_tests),$(PRODUCT_OUT)/:/)

		intermediates_dir :=
		general_tests_shared_libs_zip :=

core/tasks/general-tests.mk

+8 −27

Original line number	Diff line number	Diff line
		@@ -24,21 +24,8 @@ 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

		# Filter shared entries between general-tests and device-tests's HOST_SHARED_LIBRARY.FILES,
		# to avoid warning about overriding commands.
		my_host_shared_lib_for_general_tests := \
		$(foreach m,$(filter $(COMPATIBILITY.device-tests.HOST_SHARED_LIBRARY.FILES),\
		$(COMPATIBILITY.general-tests.HOST_SHARED_LIBRARY.FILES)),$(call word-colon,2,$(m)))
		my_general_tests_shared_lib_files := \
		$(filter-out $(COMPATIBILITY.device-tests.HOST_SHARED_LIBRARY.FILES),\
		$(COMPATIBILITY.general-tests.HOST_SHARED_LIBRARY.FILES))

		my_host_shared_lib_for_general_tests += $(call copy-many-files,$(my_general_tests_shared_lib_files))

		# Create an artifact to include all test config files in general-tests.
		general_tests_configs_zip := $(PRODUCT_OUT)/general-tests_configs.zip
		# Create an artifact to include all shared librariy files in general-tests.
		general_tests_host_shared_libs_zip := $(PRODUCT_OUT)/general-tests_host-shared-libs.zip

		# Copy kernel test modules to testcases directories
		include $(BUILD_SYSTEM)/tasks/tools/vts-kernel-tests.mk
		@@ -50,16 +37,17 @@ copy_ltp_tests := $(call copy-many-files,$(ltp_copy_pairs))
		.PHONY: vts_kernel_ltp_tests
		vts_kernel_ltp_tests: $(copy_ltp_tests)

		general_tests_shared_libs_zip := $(PRODUCT_OUT)/general-tests_host-shared-libs.zip

		$(general_tests_zip) : $(general_tests_shared_libs_zip)
		$(general_tests_zip) : $(copy_ltp_tests)
		$(general_tests_zip) : PRIVATE_KERNEL_LTP_HOST_OUT := $(kernel_ltp_host_out)
		$(general_tests_zip) : PRIVATE_general_tests_list_zip := $(general_tests_list_zip)
		$(general_tests_zip) : .KATI_IMPLICIT_OUTPUTS := $(general_tests_list_zip) $(general_tests_configs_zip) $(general_tests_host_shared_libs_zip)
		$(general_tests_zip) : .KATI_IMPLICIT_OUTPUTS := $(general_tests_list_zip) $(general_tests_configs_zip)
		$(general_tests_zip) : PRIVATE_TOOLS := $(general_tests_tools)
		$(general_tests_zip) : PRIVATE_INTERMEDIATES_DIR := $(intermediates_dir)
		$(general_tests_zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_general_tests)
		$(general_tests_zip) : PRIVATE_general_tests_configs_zip := $(general_tests_configs_zip)
		$(general_tests_zip) : PRIVATE_general_host_shared_libs_zip := $(general_tests_host_shared_libs_zip)
		$(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(general_tests_tools) $(my_host_shared_lib_for_general_tests) $(SOONG_ZIP)
		$(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(general_tests_tools) $(SOONG_ZIP)
		rm -rf $(PRIVATE_INTERMEDIATES_DIR)
		rm -f $@ $(PRIVATE_general_tests_list_zip)
		mkdir -p $(PRIVATE_INTERMEDIATES_DIR) $(PRIVATE_INTERMEDIATES_DIR)/tools
		@@ -69,11 +57,6 @@ $(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(general_tests_tool
		grep $(TARGET_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/list > $(PRIVATE_INTERMEDIATES_DIR)/target.list \|\| true
		grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/host.list > $(PRIVATE_INTERMEDIATES_DIR)/host-test-configs.list \|\| true
		grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/target.list > $(PRIVATE_INTERMEDIATES_DIR)/target-test-configs.list \|\| true
		$(hide) for shared_lib in $(PRIVATE_HOST_SHARED_LIBS); do \
		echo $$shared_lib >> $(PRIVATE_INTERMEDIATES_DIR)/host.list; \
		echo $$shared_lib >> $(PRIVATE_INTERMEDIATES_DIR)/shared-libs.list; \
		done
		grep $(HOST_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/shared-libs.list > $(PRIVATE_INTERMEDIATES_DIR)/host-shared-libs.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 \
		@@ -83,21 +66,19 @@ $(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(general_tests_tool
		$(SOONG_ZIP) -d -o $(PRIVATE_general_tests_configs_zip) \
		-P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host-test-configs.list \
		-P target -C $(PRODUCT_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/target-test-configs.list
		$(SOONG_ZIP) -d -o $(PRIVATE_general_host_shared_libs_zip) \
		-P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host-shared-libs.list
		grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/host.list \| sed s%$(HOST_OUT)%host%g > $(PRIVATE_INTERMEDIATES_DIR)/general-tests_list
		grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/target.list \| sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_INTERMEDIATES_DIR)/general-tests_list
		$(SOONG_ZIP) -d -o $(PRIVATE_general_tests_list_zip) -C $(PRIVATE_INTERMEDIATES_DIR) -f $(PRIVATE_INTERMEDIATES_DIR)/general-tests_list

		general-tests: $(general_tests_zip)
		$(call dist-for-goals, general-tests, $(general_tests_zip) $(general_tests_list_zip) $(general_tests_configs_zip) $(general_tests_host_shared_libs_zip))
		$(call dist-for-goals, general-tests, $(general_tests_zip) $(general_tests_list_zip) $(general_tests_configs_zip) $(general_tests_shared_libs_zip))

		$(call declare-1p-container,$(general_tests_zip),)
		$(call declare-container-license-deps,$(general_tests_zip),$(COMPATIBILITY.general-tests.FILES) $(general_tests_tools) $(my_host_shared_lib_for_general_tests),$(PRODUCT_OUT)/:/)
		$(call declare-container-license-deps,$(general_tests_zip),$(COMPATIBILITY.general-tests.FILES) $(general_tests_tools),$(PRODUCT_OUT)/:/)

		intermediates_dir :=
		general_tests_tools :=
		general_tests_zip :=
		general_tests_list_zip :=
		general_tests_configs_zip :=
		general_tests_host_shared_libs_zip :=
		general_tests_shared_libs_zip :=