Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69d82790 authored by JP Abgrall's avatar JP Abgrall Committed by Android Git Automerger
Browse files

am 92e0682f: resolved conflicts for merge of 7fc55db3 to lmp-mr1-dev-plus-aosp 

* commit '92e0682f':
  core: remove dependencies on genext2fs
parents 725dcdc3 92e0682f

core/Makefile

+1 −17
Original line number Diff line number Diff line
@@ -487,23 +487,7 @@ endif 
INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img



ifeq ($(TARGET_BOOTIMAGE_USE_EXT2),true)

tmp_dir_for_image := $(call intermediates-dir-for,EXECUTABLES,boot_img)/bootimg

INTERNAL_BOOTIMAGE_ARGS += --tmpdir $(tmp_dir_for_image)

INTERNAL_BOOTIMAGE_ARGS += --genext2fs $(MKEXT2IMG)



ifeq ($(TARGET_BOOTIMAGE_USE_EXTLINUX),true)

INTERNAL_BOOTIMAGE_ARGS += --extlinuxconf $(TARGET_BOOTIMAGE_EXTLINUX_CONFIG)

endif



$(INSTALLED_BOOTIMAGE_TARGET): $(MKEXT2IMG) $(INTERNAL_BOOTIMAGE_FILES)

	$(call pretty,"Target boot image: $@")

	$(hide) $(MKEXT2BOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) --output $@



.PHONY: bootimage-nodeps

bootimage-nodeps: $(MKEXT2IMG)

	@echo "make $@: ignoring dependencies"

	$(hide) $(MKEXT2BOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) --output $(INSTALLED_BOOTIMAGE_TARGET)



$(error TARGET_BOOTIMAGE_USE_EXT2 is not supported anymore)

else ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY)) # TARGET_BOOTIMAGE_USE_EXT2 != true



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_SIGNER)

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -392,12 +392,10 @@ MKBOOTIMG := $(BOARD_CUSTOM_MKBOOTIMG) 
endif

APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX)

FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)

MKEXT2IMG := $(HOST_OUT_EXECUTABLES)/genext2fs$(HOST_EXECUTABLE_SUFFIX)

MAKE_EXT4FS := $(HOST_OUT_EXECUTABLES)/make_ext4fs$(HOST_EXECUTABLE_SUFFIX)

MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg.sh

MAKE_F2FS := $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX)

MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh

MKEXT2BOOTIMG := external/genext2fs/mkbootimg_ext2.sh

SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX)

E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)

MKTARBALL := build/tools/mktarball.sh