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

Commit b43aafbe authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add explicitly merge_zips to otatools package" am: 0434412b am: 7d88e726 am: 4b60a539 

Change-Id: I5646e52d8c6c2900c8366f9be24d5d866c997402
parents da8d3309 4b60a539

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3894,7 +3894,7 @@ $(BUILT_OTATOOLS_PACKAGE): $(SOONG_ZIP) $(ZIP2ZIP) 
	mkdir -p $(dir $@)

	$(call copy-files-with-structure,$(PRIVATE_OTATOOLS_PACKAGE_FILES),$(HOST_OUT)/,$(PRIVATE_ZIP_ROOT))

	$(call copy-files-with-structure,$(PRIVATE_OTATOOLS_RELEASETOOLS),build/make/tools/,$(PRIVATE_ZIP_ROOT))

	cp $(SOONG_ZIP) $(ZIP2ZIP) $(PRIVATE_ZIP_ROOT)/bin/

	cp $(SOONG_ZIP) $(ZIP2ZIP) $(MERGE_ZIPS) $(PRIVATE_ZIP_ROOT)/bin/

	$(SOONG_ZIP) -o $@ -C $(PRIVATE_ZIP_ROOT) -D $(PRIVATE_ZIP_ROOT)



.PHONY: otatools-package