From fc26ac07a4115cbb21f6da9d9cde3665c093dea8 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Wed, 8 Jun 2022 17:03:02 -0700 Subject: [PATCH] Fix recovery_unit_test Return to using zip instead of SOONG_ZIP Bug: 235405168 Test: m droid dist Change-Id: I6f0f2fa7861bca18e34576c920a3c33ffef6b46e --- core/tasks/tools/package-modules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tasks/tools/package-modules.mk b/core/tasks/tools/package-modules.mk index aecb4a864a..a009e6b71f 100644 --- a/core/tasks/tools/package-modules.mk +++ b/core/tasks/tools/package-modules.mk @@ -94,7 +94,7 @@ endif $(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) $(SOONG_ZIP) +$(my_package_zip) : $(my_built_modules) @echo "Package $@" @rm -rf $(PRIVATE_STAGING_DIR) && mkdir -p $(PRIVATE_STAGING_DIR) $(foreach p, $(PRIVATE_COPY_PAIRS),\ @@ -103,7 +103,7 @@ $(my_package_zip) : $(my_built_modules) $(SOONG_ZIP) cp -Rf $(word 1,$(pair)) $(word 2,$(pair)) && ) true $(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\ cp -RfL $(f) $(PRIVATE_STAGING_DIR) && ) true - $(hide) $(SOONG_ZIP) -o $@ -C $(PRIVATE_STAGING_DIR) -D $(PRIVATE_STAGING_DIR) + $(hide) cd $(PRIVATE_STAGING_DIR) && zip -rqX ../$(notdir $@) * my_makefile := my_staging_dir :=