summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2018-08-01 12:35:46 -0500
committerElliott Hughes2018-08-01 12:35:46 -0500
commit8100d05778f02c18895c5268ade39e0266716a22 (patch)
tree1dc9f1a6a26085578d2ece8a409206ec6681fe79
parent4c87c1743efecaf992c7d0340041458f78fc9294 (diff)
downloadplatform-system-core-8100d05778f02c18895c5268ade39e0266716a22.tar.gz
platform-system-core-8100d05778f02c18895c5268ade39e0266716a22.tar.xz
platform-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.bp1
-rw-r--r--toolbox/Android.bp25
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 {
27phony { 27phony {
28 name: "shell_and_utilities_recovery", 28 name: "shell_and_utilities_recovery",
29 required: [ 29 required: [
30 "grep.recovery",
30 "sh.recovery", 31 "sh.recovery",
31 "toolbox.recovery", 32 "toolbox.recovery",
32 "toybox.recovery", 33 "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 {
62} 62}
63 63
64// We build BSD grep separately (but see http://b/111849261). 64// We build BSD grep separately (but see http://b/111849261).
65cc_binary { 65cc_defaults {
66 name: "grep", 66 name: "grep_common",
67 defaults: ["toolbox_defaults"], 67 defaults: ["toolbox_defaults"],
68 srcs: [ 68 srcs: [
69 "upstream-netbsd/usr.bin/grep/fastgrep.c", 69 "upstream-netbsd/usr.bin/grep/fastgrep.c",
@@ -72,8 +72,27 @@ cc_binary {
72 "upstream-netbsd/usr.bin/grep/queue.c", 72 "upstream-netbsd/usr.bin/grep/queue.c",
73 "upstream-netbsd/usr.bin/grep/util.c", 73 "upstream-netbsd/usr.bin/grep/util.c",
74 ], 74 ],
75 75 symlinks: [
76 "egrep",
77 "fgrep",
78 ],
76 sanitize: { 79 sanitize: {
77 integer_overflow: false, 80 integer_overflow: false,
78 }, 81 },
79} 82}
83
84cc_binary {
85 name: "grep",
86 defaults: ["grep_common"],
87 recovery_available: true,
88}
89
90// Build vendor grep.
91// TODO: Add vendor_available to "grep" module and remove "grep_vendor" module
92// when vendor_available is fully supported.
93cc_binary {
94 name: "grep_vendor",
95 stem: "grep",
96 vendor: true,
97 defaults: ["grep_common"],
98}