am 1888ab84: am 9edd7649: Merge "Remove mkyaffs2image references." (a7442d52) · Commits · e / os / android_build

core/Makefile

+2 −11

Original line number	Original line	Diff line number	Diff line
	@@ -694,8 +694,6 @@ INTERNAL_USERIMAGES_DEPS += $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK)
	ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)		ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)
	INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS)		INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS)
	endif		endif
	else
	INTERNAL_USERIMAGES_DEPS := $(MKYAFFS2)
	endif		endif

	INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS)))		INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS)))
	@@ -723,7 +721,6 @@ $(if $(BOARD_VENDORIMAGE_JOURNAL_SIZE),$(hide) echo "vendor_journal_size=$(BOARD
	$(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PARTITION_SIZE)" >> $(1))		$(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PARTITION_SIZE)" >> $(1))
	$(if $(BOARD_OEMIMAGE_JOURNAL_SIZE),$(hide) echo "oem_journal_size=$(BOARD_OEMIMAGE_JOURNAL_SIZE)" >> $(1))		$(if $(BOARD_OEMIMAGE_JOURNAL_SIZE),$(hide) echo "oem_journal_size=$(BOARD_OEMIMAGE_JOURNAL_SIZE)" >> $(1))
	$(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))		$(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))
	$(if $(mkyaffs2_extra_flags),$(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(1))
	$(hide) echo "selinux_fc=$(SELINUX_FC)" >> $(1)		$(hide) echo "selinux_fc=$(SELINUX_FC)" >> $(1)
	$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)" >> $(1))		$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)" >> $(1))
	$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_key=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY)" >> $(1))		$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_key=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY)" >> $(1))
	@@ -892,16 +889,11 @@ endif
	.PHONY: recoveryimage		.PHONY: recoveryimage
	recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_RESOURCE_ZIP)		recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_RESOURCE_ZIP)

	ifneq ($(BOARD_NAND_PAGE_SIZE),)		ifeq ($(BOARD_NAND_PAGE_SIZE),)
	mkyaffs2_extra_flags := -c $(BOARD_NAND_PAGE_SIZE)
	else
	mkyaffs2_extra_flags :=
	BOARD_NAND_PAGE_SIZE := 2048		BOARD_NAND_PAGE_SIZE := 2048
	endif		endif

	ifneq ($(BOARD_NAND_SPARE_SIZE),)		ifeq ($(BOARD_NAND_SPARE_SIZE),)
	mkyaffs2_extra_flags += -s $(BOARD_NAND_SPARE_SIZE)
	else
	BOARD_NAND_SPARE_SIZE := 64		BOARD_NAND_SPARE_SIZE := 64
	endif		endif

	@@ -1260,7 +1252,6 @@ DISTTOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
	$(HOST_OUT_EXECUTABLES)/mkbootfs \		$(HOST_OUT_EXECUTABLES)/mkbootfs \
	$(HOST_OUT_EXECUTABLES)/mkbootimg \		$(HOST_OUT_EXECUTABLES)/mkbootimg \
	$(HOST_OUT_EXECUTABLES)/fs_config \		$(HOST_OUT_EXECUTABLES)/fs_config \
	$(HOST_OUT_EXECUTABLES)/mkyaffs2image \
	$(HOST_OUT_EXECUTABLES)/zipalign \		$(HOST_OUT_EXECUTABLES)/zipalign \
	$(HOST_OUT_EXECUTABLES)/bsdiff \		$(HOST_OUT_EXECUTABLES)/bsdiff \
	$(HOST_OUT_EXECUTABLES)/imgdiff \		$(HOST_OUT_EXECUTABLES)/imgdiff \

core/config.mk

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -390,7 +390,6 @@ MKBOOTIMG := $(HOST_OUT_EXECUTABLES)/mkbootimg$(HOST_EXECUTABLE_SUFFIX)
	else		else
	MKBOOTIMG := $(BOARD_CUSTOM_MKBOOTIMG)		MKBOOTIMG := $(BOARD_CUSTOM_MKBOOTIMG)
	endif		endif
	MKYAFFS2 := $(HOST_OUT_EXECUTABLES)/mkyaffs2image$(HOST_EXECUTABLE_SUFFIX)
	APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX)		APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX)
	FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)		FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)
	MKEXT2IMG := $(HOST_OUT_EXECUTABLES)/genext2fs$(HOST_EXECUTABLE_SUFFIX)		MKEXT2IMG := $(HOST_OUT_EXECUTABLES)/genext2fs$(HOST_EXECUTABLE_SUFFIX)