summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2017-06-16 18:24:29 -0500
committerGerrit Code Review2017-06-16 18:24:32 -0500
commit23bcbf040dbec38b542da97485539177ac65a9d2 (patch)
treebc7153980178da8e7bcdb85c3102627396424c2f /toolbox
parent6794bc7d37957b3192dbb9868038d5ee4349fde5 (diff)
parent0c3b1bd2a5354948845ac17a86d286f4cdd1f819 (diff)
downloadplatform-system-core-23bcbf040dbec38b542da97485539177ac65a9d2.tar.gz
platform-system-core-23bcbf040dbec38b542da97485539177ac65a9d2.tar.xz
platform-system-core-23bcbf040dbec38b542da97485539177ac65a9d2.zip
Merge "Add building and installing of grep for vendor."
Diffstat (limited to 'toolbox')
-rw-r--r--toolbox/Android.bp18
1 files changed, 16 insertions, 2 deletions
diff --git a/toolbox/Android.bp b/toolbox/Android.bp
index 1c9fb2095..8db83276d 100644
--- a/toolbox/Android.bp
+++ b/toolbox/Android.bp
@@ -28,8 +28,8 @@ cc_library_static {
28} 28}
29 29
30// We build BSD grep separately, so it can provide egrep and fgrep too. 30// We build BSD grep separately, so it can provide egrep and fgrep too.
31cc_binary { 31cc_defaults {
32 name: "grep", 32 name: "grep_common",
33 srcs: [ 33 srcs: [
34 "upstream-netbsd/usr.bin/grep/fastgrep.c", 34 "upstream-netbsd/usr.bin/grep/fastgrep.c",
35 "upstream-netbsd/usr.bin/grep/file.c", 35 "upstream-netbsd/usr.bin/grep/file.c",
@@ -40,5 +40,19 @@ cc_binary {
40 cflags: common_cflags, 40 cflags: common_cflags,
41 local_include_dirs: ["upstream-netbsd/include/"], 41 local_include_dirs: ["upstream-netbsd/include/"],
42 symlinks: ["egrep", "fgrep"], 42 symlinks: ["egrep", "fgrep"],
43}
44
45cc_binary {
46 name: "grep",
47 defaults: ["grep_common"],
48}
43 49
50// Build vendor grep.
51// TODO: Add vendor_available to "grep" module and remove "grep_vendor" module
52// when vendor_available is fully supported.
53cc_binary {
54 name: "grep_vendor",
55 stem: "grep",
56 vendor: true,
57 defaults: ["grep_common"],
44} 58}