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

Commit 85af23ae authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix $(PROGUARD_DICT_ZIP) builds" into main am: f49b9a33 am: 8093f242 

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



Change-Id: Ib79370b6d931b9bdeb06c4523d30b74a166db5b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 266c6013 8093f242

core/definitions.mk

+5 −0
Original line number Diff line number Diff line
@@ -3422,6 +3422,10 @@ endef 
# $(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)
@@ -3430,6 +3434,7 @@ $(2): $(1) 
	$$(copy-file-to-target)

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

.KATI_RESTAT: $(2)

.KATI_RESTAT: $(4)

endef