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
This commit is contained in:
Elliott Hughes 2018-08-01 10:35:46 -07:00
parent 4c87c1743e
commit 8100d05778
2 changed files with 23 additions and 3 deletions

View file

@ -27,6 +27,7 @@ phony {
phony {
name: "shell_and_utilities_recovery",
required: [
"grep.recovery",
"sh.recovery",
"toolbox.recovery",
"toybox.recovery",

View file

@ -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"],
}