Commit ae01393f authored Aug 01, 2023 by Jooyung Han Committed by Automerger Merge Worker Aug 01, 2023

Merge "Revert "Add system staging dir stamp file for bazel sandwich"" into...

Merge "Revert "Add system staging dir stamp file for bazel sandwich"" into main am: 068da3ef am: 713a5e79 am: 036d7839 am: 29669208

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

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

core/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -3355,10 +3355,6 @@ systemimage_intermediates := \
		$(call intermediates-dir-for,PACKAGING,systemimage)
		BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img

		# Used by the bazel sandwich to request the staging dir be built
		$(systemimage_intermediates)/staging_dir.stamp: $(FULL_SYSTEMIMAGE_DEPS)
		touch $@

		# $(1): output file
		define build-systemimage-target
		@echo "Target system fs image: $(1)"