commit 3c565b568d77bf8032f82bdf069b63c7effeb771
author Captain Throwback <captainthrowback@hotmail.com> Thu Apr 25 12:03:27 2019 -0400
committer Captain Throwback <captainthrowback@hotmail.com> Mon Apr 29 17:44:24 2019 -0400
tree 0bba355a713f699f870d474939d2d7fa567f6741
parent 22e3aa9ed68c646050888d108257ff7fa6216910

Use BSD grep for builds with toybox

- Include symlinks for egrep and fgrep

Change-Id: I78e27f95efa143fa63def02c9e72af567833aefe

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 4d67e5b..b63935a 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -21,6 +21,11 @@
     RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/sh
     RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so
     ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 23; echo $$?),0)
+        RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/grep
+        LOCAL_POST_INSTALL_CMD += $(hide) if [ -e "$(TARGET_RECOVERY_ROOT_OUT)/sbin/egrep" ]; then \
+                                    rm $(TARGET_RECOVERY_ROOT_OUT)/sbin/egrep; fi; ln -sr $(TARGET_RECOVERY_ROOT_OUT)/sbin/grep $(TARGET_RECOVERY_ROOT_OUT)/sbin/egrep; \
+                                    if [ -e "$(TARGET_RECOVERY_ROOT_OUT)/sbin/fgrep" ]; then \
+                                    rm $(TARGET_RECOVERY_ROOT_OUT)/sbin/fgrep; fi; ln -sr $(TARGET_RECOVERY_ROOT_OUT)/sbin/grep $(TARGET_RECOVERY_ROOT_OUT)/sbin/fgrep;
         RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/toybox
         ifneq ($(wildcard external/zip/Android.mk),)
             RELINK_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/zip

toybox/Android.mk

diff --git a/toybox/Android.mk b/toybox/Android.mk
index c88f360..e2fbb86 100644
--- a/toybox/Android.mk
+++ b/toybox/Android.mk
@@ -481,15 +481,12 @@
     dd \
     df \
     diff \
-    egrep \
-    fgrep \
     flock \
     freeramdisk \
     fsfreeze \
     fstype \
     ftpget \
     ftpput \
-    grep \
     help \
     install \
     ionice \