commit b664e9074facc99748bcf91ec913c302cf930fbf
author Baligh Uddin <baligh@google.com> Sun Apr 24 19:46:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sun Apr 24 19:46:27 2016 +0000
tree b37191f51bb497f5b3a4c8eeb3f0f996a8097fd5
parent 3f578d27312e5c075daf7e66787a1b4fe64a8a4e
parent 69cf5dfc4deee1a0d48e205c3420f5a60020bb41

DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
am: 69cf5df  -s ours

* commit '69cf5dfc4deee1a0d48e205c3420f5a60020bb41':
  DO NOT MERGE ANYWHERE - Add squashFS tools to otatools

Change-Id: I324adea1d5eee7b1c7ebddb119f63861c6559944

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 3925023..07d1c94 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1306,10 +1306,6 @@
   $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \
   $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \
   $(HOST_OUT_EXECUTABLES)/make_ext4fs \
-  $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh \
-  $(HOST_OUT_EXECUTABLES)/mksquashfs \
-  $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh \
-  $(HOST_OUT_EXECUTABLES)/make_f2fs \
   $(HOST_OUT_EXECUTABLES)/simg2img \
   $(HOST_OUT_EXECUTABLES)/e2fsck \
   $(HOST_OUT_EXECUTABLES)/build_verity_tree \

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index d453303..abb4c05 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -33,7 +33,6 @@
     DownloadProviderUi \
     Email \
     ExactCalculator \
-    Exchange2 \
     ExternalStorageProvider \
     FusedLocation \
     InputDevices \