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

Commit d5f8deb3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Makefile: copy mke2fs.conf to ota root"

parents 78a41f65 3bac9b13

core/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -887,6 +887,10 @@ INTERNAL_USERIMAGES_DEPS += $(SELINUX_FC) 


INTERNAL_USERIMAGES_DEPS += $(BLK_ALLOC_TO_BASE_FS)



ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true)

INTERNAL_USERIMAGES_DEPS += $(MKE2FS_CONF)

endif



# $(1): the path of the output dictionary file

# $(2): additional "key=value" pairs to append to the dictionary file.

define generate-userimage-prop-dictionary
@@ -1941,10 +1945,11 @@ $(BUILT_OTATOOLS_PACKAGE): zip_root := $(call intermediates-dir-for,PACKAGING,ot 
$(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) | $(ACP)

	@echo "Package OTA tools: $@"

	$(hide) rm -rf $@ $(zip_root)

	$(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools $(zip_root)/system/extras/verity

	$(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools $(zip_root)/system/extras/verity $(zip_root)/system/extras/ext4_utils

	$(call copy-files-with-structure,$(OTATOOLS),$(HOST_OUT)/,$(zip_root))

	$(hide) $(ACP) $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar $(zip_root)/framework/

	$(hide) $(ACP) -p system/extras/verity/build_verity_metadata.py $(zip_root)/system/extras/verity/

	$(hide) $(ACP) -p system/extras/ext4_utils/mke2fs.conf $(zip_root)/system/extras/ext4_utils/

	$(hide) $(ACP) -r -d -p build/tools/releasetools/* $(zip_root)/releasetools

ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))

	$(hide) mkdir -p $(zip_root)/external/vboot_reference/tests/devkeys

core/config.mk

+2 −0
Original line number Diff line number Diff line
@@ -599,9 +599,11 @@ FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX) 
ifeq ($(TARGET_USES_MKE2FS),true)

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

MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh

MKE2FS_CONF := system/extras/ext4_utils/mke2fs.conf

else

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

MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg.sh

MKE2FS_CONF :=

endif

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)