Merge "Add staging dir stamp files for all partitions" into main (b5f63e65) · Commits · e / os / android_build

core/Makefile

+34 −6

Original line number	Diff line number	Diff line
		@@ -3448,14 +3448,9 @@ $(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON)))
		.PHONY: installed-file-list
		installed-file-list: $(INSTALLED_FILES_FILE)

		systemimage_intermediates :=$= $(call intermediates-dir-for,PACKAGING,systemimage)
		systemimage_intermediates :=$= $(call intermediates-dir-for,PACKAGING,system)
		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)"
		@@ -3472,6 +3467,9 @@ define build-systemimage-target
		endef

		$(eval $(call write-file-lines,$(systemimage_intermediates)/file_list.txt,$(subst $(TARGET_OUT)/,,$(filter $(TARGET_OUT)/%,$(FULL_SYSTEMIMAGE_DEPS)))))
		# Used by soong sandwich to request the staging dir be built
		$(systemimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT)/%,$(FULL_SYSTEMIMAGE_DEPS))
		touch $@

		ifeq ($(BOARD_AVB_ENABLE),true)
		$(BUILT_SYSTEMIMAGE): $(BOARD_AVB_SYSTEM_KEY_PATH)
		@@ -3586,6 +3584,9 @@ INSTALLED_USERDATAIMAGE_TARGET_DEPS := \
		$(INTERNAL_USERDATAIMAGE_FILES)

		$(eval $(call write-file-lines,$(userdataimage_intermediates)/file_list.txt,$(subst $(TARGET_OUT_DATA)/,,$(filter $(TARGET_OUT_DATA)/%,$(INSTALLED_USERDATAIMAGE_TARGET_DEPS)))))
		# Used by soong sandwich to request the staging dir be built
		$(userdataimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_DATA)/%,$(INSTALLED_USERDATAIMAGE_TARGET_DEPS))
		touch $@

		$(INSTALLED_USERDATAIMAGE_TARGET): $(INSTALLED_USERDATAIMAGE_TARGET_DEPS) $(userdataimage_intermediates)/file_list.txt
		$(build-userdataimage-target)
		@@ -3639,6 +3640,9 @@ define build-cacheimage-target
		endef

		$(eval $(call write-file-lines,$(cacheimage_intermediates)/file_list.txt,$(subst $(TARGET_OUT_CACHE)/,,$(filter $(TARGET_OUT_CACHE)/%,$(INTERNAL_CACHEIMAGE_FILES)))))
		# Used by soong sandwich to request the staging dir be built
		$(cacheimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_CACHE)/%,$(INTERNAL_CACHEIMAGE_FILES))
		touch $@

		# We just build this directly to the install location.
		INSTALLED_CACHEIMAGE_TARGET := $(BUILT_CACHEIMAGE_TARGET)
		@@ -3723,6 +3727,9 @@ define build-systemotherimage-target
		endef

		$(eval $(call write-file-lines,$(systemotherimage_intermediates)/file_list.txt,$(subst $(TARGET_OUT_SYSTEM_OTHER)/,,$(filter $(TARGET_OUT_SYSTEM_OTHER)/%,$(INTERNAL_SYSTEMOTHERIMAGE_FILES)))))
		# Used by soong sandwich to request the staging dir be built
		$(systemotherimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_SYSTEM_OTHER)/%,$(INTERNAL_SYSTEMOTHERIMAGE_FILES))
		touch $@

		# We just build this directly to the install location.
		INSTALLED_SYSTEMOTHERIMAGE_TARGET := $(BUILT_SYSTEMOTHERIMAGE_TARGET)
		@@ -3826,6 +3833,9 @@ define build-vendorimage-target
		endef

		$(eval $(call write-file-lines,$(vendorimage_intermediates)/file_list.txt,$(subst $(TARGET_OUT_VENDOR)/,,$(filter $(TARGET_OUT_VENDOR)/%,$(INTERNAL_VENDORIMAGE_FILES)))))
		# Used by soong sandwich to request the staging dir be built
		$(vendorimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_VENDOR)/%,$(INTERNAL_VENDORIMAGE_FILES))
		touch $@

		# We just build this directly to the install location.
		INSTALLED_VENDORIMAGE_TARGET := $(BUILT_VENDORIMAGE_TARGET)
		@@ -3896,6 +3906,9 @@ define build-productimage-target
		endef

		$(eval $(call write-file-lines,$(productimage_intermediates)/file_list.txt,$(subst $(TARGET_OUT_PRODUCT)/,,$(filter $(TARGET_OUT_PRODUCT)/%,$(INTERNAL_PRODUCTIMAGE_FILES)))))
		# Used by soong sandwich to request the staging dir be built
		$(productimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_PRODUCT)/%,$(INTERNAL_PRODUCTIMAGE_FILES))
		touch $@

		# We just build this directly to the install location.
		INSTALLED_PRODUCTIMAGE_TARGET := $(BUILT_PRODUCTIMAGE_TARGET)
		@@ -3963,6 +3976,9 @@ define build-system_extimage-target
		endef

		$(eval $(call write-file-lines,$(system_extimage_intermediates)/file_list.txt,$(subst $(TARGET_OUT_SYSTEM_EXT)/,,$(filter $(TARGET_OUT_SYSTEM_EXT)/%,$(INTERNAL_SYSTEM_EXTIMAGE_FILES)))))
		# Used by soong sandwich to request the staging dir be built
		$(system_extimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_SYSTEM_EXT)/%,$(INTERNAL_SYSTEM_EXTIMAGE_FILES))
		touch $@

		# We just build this directly to the install location.
		INSTALLED_SYSTEM_EXTIMAGE_TARGET := $(BUILT_SYSTEM_EXTIMAGE_TARGET)
		@@ -4049,6 +4065,9 @@ define build-odmimage-target
		endef

		$(eval $(call write-file-lines,$(odmimage_intermediates)/file_list.txt,$(subst $(TARGET_OUT_ODM)/,,$(filter $(TARGET_OUT_ODM)/%,$(INTERNAL_ODMIMAGE_FILES)))))
		# Used by soong sandwich to request the staging dir be built
		$(odmimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_ODM)/%,$(INTERNAL_ODMIMAGE_FILES))
		touch $@

		# We just build this directly to the install location.
		INSTALLED_ODMIMAGE_TARGET := $(BUILT_ODMIMAGE_TARGET)
		@@ -4115,6 +4134,9 @@ define build-vendor_dlkmimage-target
		endef

		$(eval $(call write-file-lines,$(vendor_dlkmimage_intermediates)/file_list.txt,$(subst $(TARGET_OUT_VENDOR_DLKM)/,,$(filter $(TARGET_OUT_VENDOR_DLKM)/%,$(INTERNAL_VENDOR_DLKMIMAGE_FILES)))))
		# Used by soong sandwich to request the staging dir be built
		$(vendor_dlkmimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_VENDOR_DLKM)/%,$(INTERNAL_VENDOR_DLKMIMAGE_FILES))
		touch $@

		# We just build this directly to the install location.
		INSTALLED_VENDOR_DLKMIMAGE_TARGET := $(BUILT_VENDOR_DLKMIMAGE_TARGET)
		@@ -4181,6 +4203,9 @@ define build-odm_dlkmimage-target
		endef

		$(eval $(call write-file-lines,$(odm_dlkmimage_intermediates)/file_list.txt,$(subst $(TARGET_OUT_ODM_DLKM)/,,$(filter $(TARGET_OUT_ODM_DLKM)/%,$(INTERNAL_ODM_DLKMIMAGE_FILES)))))
		# Used by soong sandwich to request the staging dir be built
		$(odm_dlkmimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_ODM_DLKM)/%,$(INTERNAL_ODM_DLKMIMAGE_FILES))
		touch $@

		# We just build this directly to the install location.
		INSTALLED_ODM_DLKMIMAGE_TARGET := $(BUILT_ODM_DLKMIMAGE_TARGET)
		@@ -4249,6 +4274,9 @@ define build-system_dlkmimage-target
		endef

		$(eval $(call write-file-lines,$(system_dlkmimage_intermediates)/file_list.txt,$(subst $(TARGET_OUT_SYSTEM_DLKM)/,,$(filter $(TARGET_OUT_SYSTEM_DLKM)/%,$(INTERNAL_SYSTEM_DLKMIMAGE_FILES)))))
		# Used by soong sandwich to request the staging dir be built
		$(system_dlkmimage_intermediates)/staging_dir.stamp: $(filter $(TARGET_OUT_SYSTEM_DLKM)/%,$(INTERNAL_SYSTEM_DLKMIMAGE_FILES))
		touch $@

		# We just build this directly to the install location.
		INSTALLED_SYSTEM_DLKMIMAGE_TARGET := $(BUILT_SYSTEM_DLKMIMAGE_TARGET)