commit bc0c779d32e30dac03cffc4be5b3af561118dd69
author Baligh Uddin <baligh@google.com> Tue Apr 26 15:52:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 26 15:52:21 2016 +0000
tree b37191f51bb497f5b3a4c8eeb3f0f996a8097fd5
parent b664e9074facc99748bcf91ec913c302cf930fbf
parent 7f53910f58a99f851ee838f0d93f66f5b639ac7b

ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1 am: f3b80ae  -s ours am: d7aa910  -s ours
am: 7f53910  -s ours

* commit '7f53910f58a99f851ee838f0d93f66f5b639ac7b':
  ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1

Change-Id: Ibee22b00bc683d6efbe8b58b53edcc3a48cc4afc

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 \