From: Ying Wang <wangying@google.com>
Date: Fri, 26 Jun 2015 21:06:32 +0000 (-0700)
Subject: Fix conflict resolving error in ef5dc90bba179f774bee0c7e479965cef12091de
X-Git-Tag: android-x86-6.0-r1~144^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=78d1cba0;p=android-x86%2Fbuild.git

Fix conflict resolving error in ef5dc90bba179f774bee0c7e479965cef12091de

Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
---

diff --git a/core/Makefile b/core/Makefile
index 6498057e2..4222fb838 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -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