Commit b8cf62ed authored Jan 19, 2024 by Cole Faust Committed by Automerger Merge Worker Jan 19, 2024

Merge "Revert "symlink_outputs: Add .KATI_SYMLINK_OUTPUTS to build/make...""...

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

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -3232,7 +3232,6 @@ $1:
		exit 1; \
		fi
		ln -sfn $2 $1
		$1: .KATI_SYMLINK_OUTPUTS := $1
		)
		$(eval PARTITION_COMPAT_SYMLINKS += $1)
		$1

+0 −1

Original line number	Diff line number	Diff line
		@@ -3306,7 +3306,6 @@ $(3): $(1)
		@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