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

Commit 1753e825 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove --sort_entries usage" into main am: abf2ded8 am: 5e7408be 

Original change: https://android-review.googlesource.com/c/platform/build/+/3502082



Change-Id: I8a7e6d511498426874da07b0199bb55977af3048
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58093575 5e7408be

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8102,7 +8102,7 @@ $(foreach partition,$(call to-upper,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)), \ 
allimages_zip := $(PRODUCT_OUT)/all_images.zip

$(allimages_zip): PRIVATE_SOONG_ZIP_ARGUMENTS := $(allimages_soong_zip_args)

$(allimages_zip): $(SOONG_ZIP) $(allimages_deps)

	$(SOONG_ZIP) -o $@ --sort_entries $(PRIVATE_SOONG_ZIP_ARGUMENTS)

	$(SOONG_ZIP) -o $@ $(PRIVATE_SOONG_ZIP_ARGUMENTS)



.PHONY: soong_only_diff_test

soong_only_diff_test: PRIVATE_ALLIMAGES_ZIP := $(allimages_zip)