diff options
| author | big biff <bigbiff@teamw.in> | 2019-05-03 01:34:27 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.omnirom.org> | 2019-05-03 01:34:27 +0200 |
| commit | 84d2300ccede49885306a33b6e20bbc0e9b2a8a8 (patch) | |
| tree | c1b01c6a3fbce7e52dfbaa492da3c27c1d2474ac | |
| parent | toybox: fix build in 6.0 tree (diff) | |
| parent | Use BSD grep for builds with toybox (diff) | |
| download | android_bootable_recovery-84d2300ccede49885306a33b6e20bbc0e9b2a8a8.tar android_bootable_recovery-84d2300ccede49885306a33b6e20bbc0e9b2a8a8.tar.gz android_bootable_recovery-84d2300ccede49885306a33b6e20bbc0e9b2a8a8.tar.bz2 android_bootable_recovery-84d2300ccede49885306a33b6e20bbc0e9b2a8a8.tar.lz android_bootable_recovery-84d2300ccede49885306a33b6e20bbc0e9b2a8a8.tar.xz android_bootable_recovery-84d2300ccede49885306a33b6e20bbc0e9b2a8a8.tar.zst android_bootable_recovery-84d2300ccede49885306a33b6e20bbc0e9b2a8a8.zip | |
| -rw-r--r-- | prebuilt/Android.mk | 5 | ||||
| -rw-r--r-- | toybox/Android.mk | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 4d67e5b77..b63935ab5 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -21,6 +21,11 @@ else 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 diff --git a/toybox/Android.mk b/toybox/Android.mk index 687982ca5..c21a27235 100644 --- a/toybox/Android.mk +++ b/toybox/Android.mk @@ -488,15 +488,12 @@ ALL_TOOLS += \ dd \ df \ diff \ - egrep \ - fgrep \ flock \ freeramdisk \ fsfreeze \ fstype \ ftpget \ ftpput \ - grep \ help \ install \ ionice \ |