summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Staats2017-06-09 11:10:59 -0500
committerErik Staats2017-06-15 17:04:41 -0500
commit0c3b1bd2a5354948845ac17a86d286f4cdd1f819 (patch)
treec0bfd273dce404d7db368771c4ef1da2030c3773 /toolbox
parentf8e96ea2d1eae5ab17c78e2469bbedc3daa1e5d4 (diff)
downloadplatform-system-core-0c3b1bd2a5354948845ac17a86d286f4cdd1f819.tar.gz
platform-system-core-0c3b1bd2a5354948845ac17a86d286f4cdd1f819.tar.xz
platform-system-core-0c3b1bd2a5354948845ac17a86d286f4cdd1f819.zip
Add building and installing of grep for vendor.
Bug: 38240024 Test: Verified that grep is installed in /vendor/bin. See details in testing done comment in https://android-review.googlesource.com/412061 . Change-Id: I06007014779310bc24c65f7343111c5217ba6ff0
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}