diff options
| author | Elliott Hughes <enh@google.com> | 2018-08-01 10:35:46 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2018-08-01 10:35:46 -0700 |
| commit | 8100d05778f02c18895c5268ade39e0266716a22 (patch) | |
| tree | 1dc9f1a6a26085578d2ece8a409206ec6681fe79 | |
| parent | 4c87c1743efecaf992c7d0340041458f78fc9294 (diff) | |
| download | system_core-8100d05778f02c18895c5268ade39e0266716a22.tar.gz system_core-8100d05778f02c18895c5268ade39e0266716a22.tar.bz2 system_core-8100d05778f02c18895c5268ade39e0266716a22.zip | |
Move back to BSD grep, and make it available for recovery too.
Bug: http://b/111849261
Bug: https://bugs.exim.org/show_bug.cgi?id=2294
Test: manual
Change-Id: Ia4f67b9f803c4f039d170f6d015a1bd2bb0ef23d
| -rw-r--r-- | shell_and_utilities/Android.bp | 1 | ||||
| -rw-r--r-- | toolbox/Android.bp | 25 |
2 files changed, 23 insertions, 3 deletions
diff --git a/shell_and_utilities/Android.bp b/shell_and_utilities/Android.bp index 0586381e8..3d7521cf2 100644 --- a/shell_and_utilities/Android.bp +++ b/shell_and_utilities/Android.bp @@ -27,6 +27,7 @@ phony { phony { name: "shell_and_utilities_recovery", required: [ + "grep.recovery", "sh.recovery", "toolbox.recovery", "toybox.recovery", diff --git a/toolbox/Android.bp b/toolbox/Android.bp index e75e4afcc..f08cf937b 100644 --- a/toolbox/Android.bp +++ b/toolbox/Android.bp @@ -62,8 +62,8 @@ cc_binary { } // We build BSD grep separately (but see http://b/111849261). -cc_binary { - name: "grep", +cc_defaults { + name: "grep_common", defaults: ["toolbox_defaults"], srcs: [ "upstream-netbsd/usr.bin/grep/fastgrep.c", @@ -72,8 +72,27 @@ cc_binary { "upstream-netbsd/usr.bin/grep/queue.c", "upstream-netbsd/usr.bin/grep/util.c", ], - + symlinks: [ + "egrep", + "fgrep", + ], sanitize: { integer_overflow: false, }, } + +cc_binary { + name: "grep", + defaults: ["grep_common"], + recovery_available: true, +} + +// Build vendor grep. +// TODO: Add vendor_available to "grep" module and remove "grep_vendor" module +// when vendor_available is fully supported. +cc_binary { + name: "grep_vendor", + stem: "grep", + vendor: true, + defaults: ["grep_common"], +} |