commit 497d30de82a218ff050fffb0d86de20922f56e76
author Adam Seaton <aseaton@google.com> Thu Aug 18 22:10:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 18 22:10:49 2016 +0000
tree 829058a52f162647a179a16b9c2fb640f5f7647c
parent 35e3465433bf813984e80a3abc35c5d2a08dbb92
parent 683d0f3780199c052135e34c2ffbd664a7184a74

Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev am: 5c021503c6 am: 728d476140
am: 683d0f3780

Change-Id: Ib212304a4bf2401c8e6c58fed54d59f300b485ef

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index ef745c6..2af421d 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 \