Merge "Fix $(PROGUARD_DICT_ZIP) builds" into main

# $(2): path in symbols directory

# $(3): file type (elf or r8)

# $(4): path in the mappings directory

#

# Regarding the restats at the end: I think you should only need to use KATI_RESTAT on $(2), but

# there appears to be a bug in kati where it was not adding restat=true in the ninja file unless we

# also added 4 to KATI_RESTAT.

define _copy-symbols-file-with-mapping

$(2): .KATI_IMPLICIT_OUTPUTS := $(4)

$(2): $(SYMBOLS_MAP)

	$$(copy-file-to-target)

	$(SYMBOLS_MAP) -$(strip $(3)) $(2) -write_if_changed $(4)

.KATI_RESTAT: $(2)

.KATI_RESTAT: $(4)

endef