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

Commit 882116d6 authored by Julien Desprez's avatar Julien Desprez
Browse files

Reland linking shared_libs to their modules 

This time also ensure we link the overlap with other
zips.

Test: presubmit, retested failures: ab/I86300010335582891
Bug: 355009651
Change-Id: I709b0ee2740978dd0cb7786804fb62bf65b3f30e
parent c1a2650b

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

deleted100644 → 0
+0 −52
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

+51 −3
Original line number Diff line number Diff line
@@ -37,22 +37,64 @@ 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

# 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))



my_host_shared_lib_symlinks := \

    $(filter $(COMPATIBILITY.host-unit-tests.SYMLINKS),\

	$(COMPATIBILITY.general-tests.SYMLINKS))



my_general_tests_symlinks := \

    $(filter-out $(COMPATIBILITY.camera-hal-tests.SYMLINKS),\

    $(filter-out $(COMPATIBILITY.host-unit-tests.SYMLINKS),\

	 $(COMPATIBILITY.general-tests.SYMLINKS)))



my_symlinks_for_general_tests := $(foreach f,$(my_general_tests_symlinks),\

	$(strip $(eval _cmf_tuple := $(subst :, ,$(f))) \

	$(eval _cmf_dep := $(word 1,$(_cmf_tuple))) \

	$(eval _cmf_src := $(word 2,$(_cmf_tuple))) \

	$(eval _cmf_dest := $(word 3,$(_cmf_tuple))) \

	$(call symlink-file,$(_cmf_dep),$(_cmf_src),$(_cmf_dest)) \

	$(_cmf_dest)))



# In this one directly take the overlap into the zip since we can't rewrite rules

my_symlinks_for_general_tests += $(foreach f,$(my_host_shared_lib_symlinks),\

        $(strip $(eval _cmf_tuple := $(subst :, ,$(f))) \

        $(eval _cmf_dep := $(word 1,$(_cmf_tuple))) \

        $(eval _cmf_src := $(word 2,$(_cmf_tuple))) \

        $(eval _cmf_dest := $(word 3,$(_cmf_tuple))) \

        $(_cmf_dest)))



$(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_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_SYMLINKS := $(my_symlinks_for_general_tests)

$(general_tests_zip) : PRIVATE_general_tests_configs_zip := $(general_tests_configs_zip)

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

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

	rm -rf $(PRIVATE_INTERMEDIATES_DIR)

	rm -f $@ $(PRIVATE_general_tests_list_zip)

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

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

	find $(PRIVATE_KERNEL_LTP_HOST_OUT) >> $(PRIVATE_INTERMEDIATES_DIR)/list

	for symlink in $(PRIVATE_SYMLINKS); do \

	  echo $$symlink >> $(PRIVATE_INTERMEDIATES_DIR)/list; \

	done

	$(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

	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

	grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/host.list > $(PRIVATE_INTERMEDIATES_DIR)/host-test-configs.list || true
@@ -62,6 +104,7 @@ $(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(COMPATIBILITY.gene 
	  -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 \

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

	  -sha256

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

	  -P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host-test-configs.list \
@@ -82,3 +125,8 @@ general_tests_zip := 
general_tests_list_zip :=

general_tests_configs_zip :=

general_tests_shared_libs_zip :=

my_host_shared_lib_for_general_tests :=

my_symlinks_for_general_tests :=

my_general_tests_shared_lib_files :=

my_general_tests_symlinks :=

my_host_shared_lib_symlinks :=