commit b8cf62ed0819715102a91dc01416505c6700225f
author Cole Faust <colefaust@google.com> Fri Jan 19 19:59:23 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 19 19:59:23 2024 +0000
tree adbe750a8c61e3b3a565fc21a6ae534167970fc8
parent 65e0c618e05592fbb3a9f56612033a15c7747d0e
parent a4e395b2af92ab1da0635a78eae4c1e9ee293b85

Merge "Revert "symlink_outputs: Add .KATI_SYMLINK_OUTPUTS to build/make..."" into main am: a4e395b2af

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

Change-Id: Ib31ade7fa13e2d6c6446d4f283f32c5ca67177a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 90312d0..b3870e5 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3232,7 +3232,6 @@
 	  exit 1; \
 	fi
 	ln -sfn $2 $1
-$1: .KATI_SYMLINK_OUTPUTS := $1
 )
 $(eval PARTITION_COMPAT_SYMLINKS += $1)
 $1

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 1f2d011..ed842bc 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -3306,7 +3306,6 @@
 	@mkdir -p $$(dir $$@)
 	@rm -rf $$@
 	$(hide) ln -sf $(2) $$@
-$(3): .KATI_SYMLINK_OUTPUTS := $(3)
 endef
 
 # Copy an apk to a target location while removing classes*.dex