DO NOT MERGE ANYWHERE - am: 442ae0fe5c -s ours

am: a21a89051e  -s ours

* commit 'a21a89051e1b4fdef4aa06f7d17f188d6fbcefe6':
  DO NOT MERGE ANYWHERE -

Change-Id: I647de52990f81a5a713f1cdd6064dd4a853144d5

diff --git a/core/Makefile b/core/Makefile
index 156bcbb..44adf08 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -1306,10 +1306,6 @@ DISTTOOLS :=  $(HOST_OUT_EXECUTABLES)/minigzip \
   $(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 \

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