diff options
| author | Captain Throwback <captainthrowback@hotmail.com> | 2019-04-25 18:03:27 +0200 |
|---|---|---|
| committer | Captain Throwback <captainthrowback@hotmail.com> | 2019-04-29 23:44:24 +0200 |
| commit | 3c565b568d77bf8032f82bdf069b63c7effeb771 (patch) | |
| tree | 0bba355a713f699f870d474939d2d7fa567f6741 | |
| parent | ext4crypt: add missing cflag (diff) | |
| download | android_bootable_recovery-3c565b568d77bf8032f82bdf069b63c7effeb771.tar android_bootable_recovery-3c565b568d77bf8032f82bdf069b63c7effeb771.tar.gz android_bootable_recovery-3c565b568d77bf8032f82bdf069b63c7effeb771.tar.bz2 android_bootable_recovery-3c565b568d77bf8032f82bdf069b63c7effeb771.tar.lz android_bootable_recovery-3c565b568d77bf8032f82bdf069b63c7effeb771.tar.xz android_bootable_recovery-3c565b568d77bf8032f82bdf069b63c7effeb771.tar.zst android_bootable_recovery-3c565b568d77bf8032f82bdf069b63c7effeb771.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 c88f360f5..e2fbb86c4 100644 --- a/toybox/Android.mk +++ b/toybox/Android.mk @@ -481,15 +481,12 @@ ALL_TOOLS += \ dd \ df \ diff \ - egrep \ - fgrep \ flock \ freeramdisk \ fsfreeze \ fstype \ ftpget \ ftpput \ - grep \ help \ install \ ionice \ |