commit 8cad379e98f0ae2e3dfb47181218211514370a33
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 02 04:11:10 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 02 04:11:10 2023 +0000
tree 1af4b41a39f82afb050480646123bf565ca288be
parent 092719a47166da21381ff4c3d02e44b8fa5af322
parent 4ad906d6a4177bd28303caa38853807e47dc280d

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

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 6073f13..07d705e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3355,6 +3355,10 @@
     $(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)"