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

Commit 042637cc authored by Cole Faust's avatar Cole Faust Committed by Android (Google) Code Review
Browse files

Merge "Don't install test suite shared library files" into main

parents 6c21c225 0813fb6c

core/tasks/device-tests.mk

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ device-tests-zip := $(PRODUCT_OUT)/device-tests.zip 
device-tests-list-zip := $(PRODUCT_OUT)/device-tests_list.zip

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

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

my_host_shared_lib_for_device_tests := $(foreach p,$(COMPATIBILITY.device-tests.HOST_SHARED_LIBRARY.FILES),$(call word-colon,2,$(p)))

device_tests_files_list := $(PRODUCT_OUT)/device-tests_files



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

core/tasks/general-tests.mk

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 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_for_general_tests += $(foreach p,$(my_general_tests_shared_lib_files),$(call word-colon,2,$(p)))



my_host_shared_lib_symlinks := \

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

core/tasks/tools/compatibility.mk

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ test_copied_tools := $(foreach t,$(test_tools) $(test_suite_prebuilt_tools), $(o 




# Include host shared libraries

host_shared_libs := $(call copy-many-files, $(COMPATIBILITY.$(test_suite_name).HOST_SHARED_LIBRARY.FILES))

host_shared_libs := $(foreach p,$(COMPATIBILITY.$(test_suite_name).HOST_SHARED_LIBRARY.FILES),$(call word-colon,2,$(p)))



$(if $(strip $(host_shared_libs)),\

  $(foreach p,$(COMPATIBILITY.$(test_suite_name).HOST_SHARED_LIBRARY.FILES),\