commit f9e71768b3bc402922f1706b77bade331ba651f0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 06 16:22:55 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 06 16:22:55 2025 -0800
tree 3dbac9cff7f67baee02443c429f8449e77ac53c3
parent 2116cdc9b50bb9cd3262e8a1a63ca4a66be46103
parent a2b54e1e06c235f77295c24e62bac35b9aad92f5

Merge "Use soong-zip to build test zips" into main

core/tasks/tools/package-modules.mk

diff --git a/core/tasks/tools/package-modules.mk b/core/tasks/tools/package-modules.mk
index 4ec5520..4d7b0ee 100644
--- a/core/tasks/tools/package-modules.mk
+++ b/core/tasks/tools/package-modules.mk
@@ -96,7 +96,7 @@
 $(my_package_zip): PRIVATE_COPY_PAIRS := $(my_copy_pairs)
 $(my_package_zip): PRIVATE_STAGING_DIR := $(my_staging_dir)
 $(my_package_zip): PRIVATE_PICKUP_FILES := $(my_pickup_files)
-$(my_package_zip) : $(my_built_modules)
+$(my_package_zip) : $(my_built_modules) $(SOONG_ZIP)
 	@echo "Package $@"
 	@rm -rf $(PRIVATE_STAGING_DIR) && mkdir -p $(PRIVATE_STAGING_DIR)
 	$(foreach p, $(PRIVATE_COPY_PAIRS),\
@@ -105,7 +105,7 @@
 	  cp -Rf $(word 1,$(pair)) $(word 2,$(pair)) && ) true
 	$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\
 	  cp -RfL $(f) $(PRIVATE_STAGING_DIR) && ) true
-	$(hide) cd $(PRIVATE_STAGING_DIR) && zip -rqX ../$(notdir $@) *
+	$(hide) $(SOONG_ZIP) -o $@ -C $(PRIVATE_STAGING_DIR) -D $(PRIVATE_STAGING_DIR)
 	rm -rf $(PRIVATE_STAGING_DIR)
 
 my_makefile :=