diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-05 18:47:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 18:47:25 +0000 |
| commit | 1888ab842a4308c3898beec434ac59bcda12617b (patch) | |
| tree | f4dc782c098a6e7b305ce239cdd4d32ece1f3789 /core/Makefile | |
| parent | 5755589141358a4f82cada56e6738075c670011f (diff) | |
| parent | 9edd76494d4378bd740dd22a2eb4f5d0eb0db40f (diff) | |
| download | build-1888ab842a4308c3898beec434ac59bcda12617b.zip build-1888ab842a4308c3898beec434ac59bcda12617b.tar.gz build-1888ab842a4308c3898beec434ac59bcda12617b.tar.bz2 | |
am 9edd7649: Merge "Remove mkyaffs2image references."
* commit '9edd76494d4378bd740dd22a2eb4f5d0eb0db40f':
Remove mkyaffs2image references.
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/core/Makefile b/core/Makefile index cd7c66f..84a3dcf 100644 --- a/core/Makefile +++ b/core/Makefile @@ -694,8 +694,6 @@ INTERNAL_USERIMAGES_DEPS += $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(E2FSCK) ifeq ($(TARGET_USERIMAGES_USE_F2FS),true) INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS) endif -else -INTERNAL_USERIMAGES_DEPS := $(MKYAFFS2) endif 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_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 $(mkyaffs2_extra_flags),$(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(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_key=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY)" >> $(1)) @@ -892,16 +889,11 @@ endif .PHONY: recoveryimage recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_RESOURCE_ZIP) -ifneq ($(BOARD_NAND_PAGE_SIZE),) -mkyaffs2_extra_flags := -c $(BOARD_NAND_PAGE_SIZE) -else -mkyaffs2_extra_flags := +ifeq ($(BOARD_NAND_PAGE_SIZE),) BOARD_NAND_PAGE_SIZE := 2048 endif -ifneq ($(BOARD_NAND_SPARE_SIZE),) -mkyaffs2_extra_flags += -s $(BOARD_NAND_SPARE_SIZE) -else +ifeq ($(BOARD_NAND_SPARE_SIZE),) BOARD_NAND_SPARE_SIZE := 64 endif @@ -1260,7 +1252,6 @@ DISTTOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_EXECUTABLES)/mkbootfs \ $(HOST_OUT_EXECUTABLES)/mkbootimg \ $(HOST_OUT_EXECUTABLES)/fs_config \ - $(HOST_OUT_EXECUTABLES)/mkyaffs2image \ $(HOST_OUT_EXECUTABLES)/zipalign \ $(HOST_OUT_EXECUTABLES)/bsdiff \ $(HOST_OUT_EXECUTABLES)/imgdiff \ |