diff options
Diffstat (limited to 'core/tasks/automotive-general-tests.mk')
| -rw-r--r-- | core/tasks/automotive-general-tests.mk | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/core/tasks/automotive-general-tests.mk b/core/tasks/automotive-general-tests.mk index 44b62bef78..5497178f2a 100644 --- a/core/tasks/automotive-general-tests.mk +++ b/core/tasks/automotive-general-tests.mk @@ -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 |