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

Commit 1a4658cd authored by Mohamad Ayyash's avatar Mohamad Ayyash
Browse files

resolved conflicts for merge of ef5dc90b to lmp-mr1-ub-dev

parents 48cb24a6 ef5dc90b

core/Makefile

+19 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) 
endif



ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs)

INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG)

INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) $(IMG2SIMG)

endif



INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS)))
@@ -1281,6 +1281,24 @@ DISTTOOLS += \ 
  $(HOST_LIBRARY_PATH)/liblog$(HOST_SHLIB_SUFFIX) \

  $(HOST_LIBRARY_PATH)/libcutils$(HOST_SHLIB_SUFFIX) \

  $(HOST_LIBRARY_PATH)/libselinux$(HOST_SHLIB_SUFFIX)

	  $(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 \

	  $(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar \

	  $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \

	  $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \

	  $(HOST_OUT_EXECUTABLES)/make_ext4fs \

	  $(HOST_OUT_EXECUTABLES)/simg2img \

	  $(HOST_OUT_EXECUTABLES)/e2fsck \

	  $(HOST_OUT_EXECUTABLES)/build_verity_tree \

	  $(HOST_OUT_EXECUTABLES)/verity_signer \

	  $(HOST_OUT_EXECUTABLES)/append2simg \

	  $(HOST_OUT_EXECUTABLES)/img2simg \

	  $(HOST_OUT_EXECUTABLES)/boot_signer



OTATOOLS := $(DISTTOOLS) \

  $(HOST_OUT_EXECUTABLES)/aapt

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ endif 
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/tools/mktarball.sh

TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)