diff options
Diffstat (limited to 'core/tasks/tools/compatibility.mk')
| -rw-r--r-- | core/tasks/tools/compatibility.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index f205cea156..110f988025 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -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),\ @@ -140,13 +140,13 @@ $(compatibility_zip): $(compatibility_zip_deps) | $(ADB) $(ACP) cp $(PRIVATE_TOOLS) $(PRIVATE_OUT_DIR)/tools $(if $(PRIVATE_DYNAMIC_CONFIG),$(hide) cp $(PRIVATE_DYNAMIC_CONFIG) $(PRIVATE_OUT_DIR)/testcases/$(PRIVATE_SUITE_NAME).dynamic) find $(PRIVATE_RESOURCES) | sort >$@.list - $(SOONG_ZIP) -d -o $@.tmp -C $(dir $@) -l $@.list -sha256 - $(MERGE_ZIPS) $@ $@.tmp $(PRIVATE_JDK) + $(SOONG_ZIP) -o $@.tmp -C $(dir $@) -l $@.list -sha256 + $(MERGE_ZIPS) -s $@ $@.tmp $(PRIVATE_JDK) rm -f $@.tmp # Build a list of tests rm -f $(PRIVATE_tests_list) $(hide) grep -e .*\\.config$$ $@.list | sed s%$(PRIVATE_OUT_DIR)/testcases/%%g > $(PRIVATE_tests_list) - $(SOONG_ZIP) -d -o $(PRIVATE_tests_list_zip) -j -f $(PRIVATE_tests_list) + $(SOONG_ZIP) -o $(PRIVATE_tests_list_zip) -j -f $(PRIVATE_tests_list) rm -f $(PRIVATE_tests_list) $(call declare-0p-target,$(compatibility_tests_list_zip),) |