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

Commit 78d1cba0 authored by Ying Wang's avatar Ying Wang
Browse files

Fix conflict resolving error in ef5dc90b 

Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
parent 1a4658cd

core/Makefile

+0 −18
Original line number Diff line number Diff line
@@ -1281,24 +1281,6 @@ 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