diff options
author | Elliott Hughes | 2018-08-01 15:28:27 -0500 |
---|---|---|
committer | Gerrit Code Review | 2018-08-01 15:28:27 -0500 |
commit | af7e4567a3a70056598554392332980759f2e441 (patch) | |
tree | 973355f76be2cf478e63d78427a1a3fa355dfc38 | |
parent | 081b710b2ee7f726f1bef282333c397006b6b37f (diff) | |
parent | 8100d05778f02c18895c5268ade39e0266716a22 (diff) | |
download | platform-system-core-af7e4567a3a70056598554392332980759f2e441.tar.gz platform-system-core-af7e4567a3a70056598554392332980759f2e441.tar.xz platform-system-core-af7e4567a3a70056598554392332980759f2e441.zip |
Merge "Move back to BSD grep, and make it available for recovery too."
-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 { | |||
27 | phony { | 27 | phony { |
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). |
65 | cc_binary { | 65 | cc_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 | |||
84 | cc_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. | ||
93 | cc_binary { | ||
94 | name: "grep_vendor", | ||
95 | stem: "grep", | ||
96 | vendor: true, | ||
97 | defaults: ["grep_common"], | ||
98 | } | ||