From c86ea11fe9c3ce7e5643e3a77b4bcf1827e7a4f4 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 30 Mar 2017 23:20:10 -0700
Subject: [PATCH] Switch to a shell_and_utilities phony module.

(cherrypick of cb7d59687483c9532beecde60fe96053eda76948.)

Bug: N/A
Test: builds
Change-Id: I6416d9dded4cc225f57f0a521cf6114f39203ece
---
 target/product/embedded.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index a9075c9a0..e04731c54 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -33,8 +33,6 @@ PRODUCT_PACKAGES += \
     dumpsys \
     fastboot \
     gralloc.default \
-    grep \
-    gzip \
     healthd \
     hwservicemanager \
     init \
@@ -71,16 +69,12 @@ PRODUCT_PACKAGES += \
     logcat \
     logwrapper \
     lshal \
-    mkshrc \
-    reboot \
     recovery \
     service \
     servicemanager \
-    sh \
+    shell_and_utilities \
     surfaceflinger \
     tombstoned \
-    toolbox \
-    toybox \
     tzdatacheck \
 
 # SELinux packages