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

Commit d2fe7f06 authored by Spandan Das's avatar Spandan Das Committed by Android (Google) Code Review
Browse files

Merge "Cleanup COMPATIBILITY.automotive-tests.HOST_SHARED_LIBRARY.FILES" into main

parents a85716ac 03431001

core/tasks/automotive-general-tests.mk

+1 −19
Original line number Diff line number Diff line
@@ -24,17 +24,6 @@ automotive_general_tests_zip := $(PRODUCT_OUT)/automotive-general-tests.zip 
# Create an artifact to include a list of test config files in automotive-general-tests.

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



# Filter shared entries between automotive-general-tests and automotive-tests's HOST_SHARED_LIBRARY.FILES,

# to avoid warning about overriding commands.

my_host_shared_lib_for_automotive_general_tests := \

  $(foreach m,$(filter $(COMPATIBILITY.automotive-tests.HOST_SHARED_LIBRARY.FILES),\

	   $(COMPATIBILITY.automotive-general-tests.HOST_SHARED_LIBRARY.FILES)),$(call word-colon,2,$(m)))

my_automotive_general_tests_shared_lib_files := \

  $(filter-out $(COMPATIBILITY.automotive-tests.HOST_SHARED_LIBRARY.FILES),\

	 $(COMPATIBILITY.automotive-general-tests.HOST_SHARED_LIBRARY.FILES))



my_host_shared_lib_for_automotive_general_tests += $(call copy-many-files,$(my_automotive_general_tests_shared_lib_files))



# Create an artifact to include all test config files in automotive-general-tests.

automotive_general_tests_configs_zip := $(PRODUCT_OUT)/automotive-general-tests_configs.zip

# Create an artifact to include all shared librariy files in automotive-general-tests.
@@ -44,7 +33,6 @@ $(automotive_general_tests_zip) : PRIVATE_automotive_general_tests_list_zip := $ 
$(automotive_general_tests_zip) : .KATI_IMPLICIT_OUTPUTS := $(automotive_general_tests_list_zip) $(automotive_general_tests_configs_zip) $(automotive_general_tests_host_shared_libs_zip)

$(automotive_general_tests_zip) : PRIVATE_TOOLS := $(automotive_general_tests_tools)

$(automotive_general_tests_zip) : PRIVATE_INTERMEDIATES_DIR := $(intermediates_dir)

$(automotive_general_tests_zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_automotive_general_tests)

$(automotive_general_tests_zip) : PRIVATE_automotive_general_tests_configs_zip := $(automotive_general_tests_configs_zip)

$(automotive_general_tests_zip) : PRIVATE_general_host_shared_libs_zip := $(automotive_general_tests_host_shared_libs_zip)

$(automotive_general_tests_zip) : $(COMPATIBILITY.automotive-general-tests.FILES) $(automotive_general_tests_tools) $(my_host_shared_lib_for_automotive_general_tests) $(SOONG_ZIP)
@@ -56,11 +44,6 @@ $(automotive_general_tests_zip) : $(COMPATIBILITY.automotive-general-tests.FILES 
	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 \
@@ -69,8 +52,7 @@ $(automotive_general_tests_zip) : $(COMPATIBILITY.automotive-general-tests.FILES 
	$(SOONG_ZIP) -d -o $(PRIVATE_automotive_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

	$(SOONG_ZIP) -o $(PRIVATE_general_host_shared_libs_zip) # empty file

	grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_INTERMEDIATES_DIR)/automotive-general-tests_list

	grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_INTERMEDIATES_DIR)/automotive-general-tests_list

	$(SOONG_ZIP) -d -o $(PRIVATE_automotive_general_tests_list_zip) -C $(PRIVATE_INTERMEDIATES_DIR) -f $(PRIVATE_INTERMEDIATES_DIR)/automotive-general-tests_list

core/tasks/automotive-sdv-tests.mk

+2 −11
Original line number Diff line number Diff line
@@ -20,37 +20,28 @@ automotive-sdv-tests-zip := $(PRODUCT_OUT)/automotive-sdv-tests.zip 
automotive-sdv-tests-list-zip := $(PRODUCT_OUT)/automotive-sdv-tests_list.zip

# Create an artifact to include all test config files in automotive-sdv-tests.

automotive-sdv-tests-configs-zip := $(PRODUCT_OUT)/automotive-sdv-tests_configs.zip

my_host_shared_lib_for_automotive_sdv_tests := $(call copy-many-files,$(COMPATIBILITY.automotive-sdv-tests.HOST_SHARED_LIBRARY.FILES))

automotive_sdv_tests_host_shared_libs_zip := $(PRODUCT_OUT)/automotive-sdv-tests_host-shared-libs.zip



$(automotive-sdv-tests-zip) : .KATI_IMPLICIT_OUTPUTS := $(automotive-sdv-tests-list-zip) $(automotive-sdv-tests-configs-zip) $(automotive_sdv_tests_host_shared_libs_zip)

$(automotive-sdv-tests-zip) : PRIVATE_automotive_sdv_tests_list := $(PRODUCT_OUT)/automotive-sdv-tests_list

$(automotive-sdv-tests-zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_automotive_sdv_tests)

$(automotive-sdv-tests-zip) : PRIVATE_automotive_host_shared_libs_zip := $(automotive_sdv_tests_host_shared_libs_zip)

$(automotive-sdv-tests-zip) : $(COMPATIBILITY.automotive-sdv-tests.FILES) $(my_host_shared_lib_for_automotive_sdv_tests) $(SOONG_ZIP)

	rm -f $@-shared-libs.list

	echo $(sort $(COMPATIBILITY.automotive-sdv-tests.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

	$(hide) $(SOONG_ZIP) -d -o $(automotive-sdv-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_automotive_host_shared_libs_zip) \

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

	$(SOONG_ZIP) -o $(PRIVATE_automotive_host_shared_libs_zip) # empty file

	rm -f $(PRIVATE_automotive_sdv_tests_list)

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

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

	$(hide) $(SOONG_ZIP) -d -o $(automotive-sdv-tests-list-zip) -C $(dir $@) -f $(PRIVATE_automotive_sdv_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_automotive_sdv_tests_list)

	  $(PRIVATE_automotive_sdv_tests_list)



automotive-sdv-tests: $(automotive-sdv-tests-zip)

$(call dist-for-goals, automotive-sdv-tests, $(automotive-sdv-tests-zip) $(automotive-sdv-tests-list-zip) $(automotive-sdv-tests-configs-zip) $(automotive_sdv_tests_host_shared_libs_zip))

core/tasks/automotive-tests.mk

+2 −11
Original line number Diff line number Diff line
@@ -20,37 +20,28 @@ automotive-tests-zip := $(PRODUCT_OUT)/automotive-tests.zip 
automotive-tests-list-zip := $(PRODUCT_OUT)/automotive-tests_list.zip

# Create an artifact to include all test config files in automotive-tests.

automotive-tests-configs-zip := $(PRODUCT_OUT)/automotive-tests_configs.zip

my_host_shared_lib_for_automotive_tests := $(call copy-many-files,$(COMPATIBILITY.automotive-tests.HOST_SHARED_LIBRARY.FILES))

automotive_tests_host_shared_libs_zip := $(PRODUCT_OUT)/automotive-tests_host-shared-libs.zip



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

$(automotive-tests-zip) : PRIVATE_automotive_tests_list := $(PRODUCT_OUT)/automotive-tests_list

$(automotive-tests-zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_automotive_tests)

$(automotive-tests-zip) : PRIVATE_automotive_host_shared_libs_zip := $(automotive_tests_host_shared_libs_zip)

$(automotive-tests-zip) : $(COMPATIBILITY.automotive-tests.FILES) $(my_host_shared_lib_for_automotive_tests) $(SOONG_ZIP)

	rm -f $@-shared-libs.list

	echo $(sort $(COMPATIBILITY.automotive-tests.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

	$(hide) $(SOONG_ZIP) -d -o $(automotive-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_automotive_host_shared_libs_zip) \

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

	$(SOONG_ZIP) -o $(PRIVATE_automotive_host_shared_libs_zip) # empty file

	rm -f $(PRIVATE_automotive_tests_list)

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

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

	$(hide) $(SOONG_ZIP) -d -o $(automotive-tests-list-zip) -C $(dir $@) -f $(PRIVATE_automotive_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_automotive_tests_list)

	  $(PRIVATE_automotive_tests_list)



automotive-tests: $(automotive-tests-zip)

$(call dist-for-goals, automotive-tests, $(automotive-tests-zip) $(automotive-tests-list-zip) $(automotive-tests-configs-zip) $(automotive_tests_host_shared_libs_zip))