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

Commit fc26ac07 authored by Bob Badour's avatar Bob Badour
Browse files

Fix recovery_unit_test 

Return to using zip instead of SOONG_ZIP

Bug: 235405168

Test: m droid dist
Change-Id: I6f0f2fa7861bca18e34576c920a3c33ffef6b46e
parent 5c6b4e02

core/tasks/tools/package-modules.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 :=