Merge "Clean up the dependencies for user image creation." (ec53f441) · Commits · e / os / android_build

core/Makefile

+20 −18

Original line number	Diff line number	Diff line
		@@ -1310,27 +1310,26 @@ DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ext4=max_batch_time=0,commit=1,d
		ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED))
		INTERNAL_USERIMAGES_SPARSE_EXT_FLAG := -s
		endif

		INTERNAL_USERIMAGES_DEPS := $(SIMG2IMG)
		INTERNAL_USERIMAGES_DEPS += $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) $(TUNE2FS)
		ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)
		INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS)
		ifneq (true,$(TARGET_USERIMAGES_SPARSE_SQUASHFS_DISABLED))
		INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG := -s
		endif

		ifeq ($(BOARD_AVB_ENABLE),true)
		INTERNAL_USERIMAGES_DEPS += $(AVBTOOL)
		endif
		INTERNAL_USERIMAGES_DEPS := \
		$(BLK_ALLOC_TO_BASE_FS) \
		$(E2FSCK) \
		$(MKE2FS_CONF) \
		$(MKEXTUSERIMG) \
		$(SIMG2IMG) \
		$(TUNE2FS)

		ifneq (true,$(TARGET_USERIMAGES_SPARSE_SQUASHFS_DISABLED))
		INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG := -s
		ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)
		INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG)
		endif

		ifneq ($(filter $(BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE) $(BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE) $(BOARD_ODMIMAGE_FILE_SYSTEM_TYPE) $(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE) $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs),)
		INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) $(IMG2SIMG)
		INTERNAL_USERIMAGES_DEPS += $(MKSQUASHFSUSERIMG)
		endif

		# Get a colon-separated list of search paths.
		INTERNAL_USERIMAGES_BINARY_PATHS := $(subst $(space),:,$(sort $(dir $(INTERNAL_USERIMAGES_DEPS))))

		ifeq (true,$(PRODUCT_SUPPORTS_VERITY))
		INTERNAL_USERIMAGES_DEPS += $(BUILD_VERITY_METADATA) $(BUILD_VERITY_TREE) $(APPEND2SIMG) $(VERITY_SIGNER)
		ifeq (true,$(PRODUCT_SUPPORTS_VERITY_FEC))
		@@ -1338,12 +1337,15 @@ INTERNAL_USERIMAGES_DEPS += $(FEC)
		endif
		endif

		SELINUX_FC := $(call intermediates-dir-for,ETC,file_contexts.bin)/file_contexts.bin
		INTERNAL_USERIMAGES_DEPS += $(SELINUX_FC)
		ifeq ($(BOARD_AVB_ENABLE),true)
		INTERNAL_USERIMAGES_DEPS += $(AVBTOOL)
		endif

		INTERNAL_USERIMAGES_DEPS += $(BLK_ALLOC_TO_BASE_FS)
		# Get a colon-separated list of search paths.
		INTERNAL_USERIMAGES_BINARY_PATHS := $(subst $(space),:,$(sort $(dir $(INTERNAL_USERIMAGES_DEPS))))

		INTERNAL_USERIMAGES_DEPS += $(MKE2FS_CONF)
		SELINUX_FC := $(call intermediates-dir-for,ETC,file_contexts.bin)/file_contexts.bin
		INTERNAL_USERIMAGES_DEPS += $(SELINUX_FC)

		ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))

core/config.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -577,16 +577,12 @@ AVBTOOL := $(BOARD_CUSTOM_AVBTOOL)
		endif
		APICHECK := $(HOST_OUT_JAVA_LIBRARIES)/metalava$(COMMON_JAVA_PACKAGE_SUFFIX)
		FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)
		MAKE_EXT4FS := $(HOST_OUT_EXECUTABLES)/mke2fs$(HOST_EXECUTABLE_SUFFIX)
		MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs
		MKE2FS_CONF := system/extras/ext4_utils/mke2fs.conf
		BLK_ALLOC_TO_BASE_FS := $(HOST_OUT_EXECUTABLES)/blk_alloc_to_base_fs$(HOST_EXECUTABLE_SUFFIX)
		MAKE_SQUASHFS := $(HOST_OUT_EXECUTABLES)/mksquashfs$(HOST_EXECUTABLE_SUFFIX)
		MKSQUASHFSUSERIMG := $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh
		MAKE_F2FS := $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX)
		MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh
		SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX)
		IMG2SIMG := $(HOST_OUT_EXECUTABLES)/img2simg$(HOST_EXECUTABLE_SUFFIX)
		E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)
		MKTARBALL := build/make/tools/mktarball.sh
		TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)