diff options
| author | Erik Staats <estaats@google.com> | 2017-06-09 09:10:59 -0700 |
|---|---|---|
| committer | Erik Staats <estaats@google.com> | 2017-06-15 15:04:41 -0700 |
| commit | 0c3b1bd2a5354948845ac17a86d286f4cdd1f819 (patch) | |
| tree | c0bfd273dce404d7db368771c4ef1da2030c3773 | |
| parent | f8e96ea2d1eae5ab17c78e2469bbedc3daa1e5d4 (diff) | |
| download | core-0c3b1bd2a5354948845ac17a86d286f4cdd1f819.tar.gz core-0c3b1bd2a5354948845ac17a86d286f4cdd1f819.tar.bz2 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
| -rw-r--r-- | shell_and_utilities/Android.bp | 1 | ||||
| -rw-r--r-- | toolbox/Android.bp | 18 |
2 files changed, 17 insertions, 2 deletions
diff --git a/shell_and_utilities/Android.bp b/shell_and_utilities/Android.bp index 4f4fc5d8e..6d35fedb5 100644 --- a/shell_and_utilities/Android.bp +++ b/shell_and_utilities/Android.bp @@ -3,6 +3,7 @@ phony { required: [ "bzip2", "grep", + "grep_vendor", "gzip", "mkshrc", "mkshrc_vendor", 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 { } // We build BSD grep separately, so it can provide egrep and fgrep too. -cc_binary { - name: "grep", +cc_defaults { + name: "grep_common", srcs: [ "upstream-netbsd/usr.bin/grep/fastgrep.c", "upstream-netbsd/usr.bin/grep/file.c", @@ -40,5 +40,19 @@ cc_binary { cflags: common_cflags, local_include_dirs: ["upstream-netbsd/include/"], symlinks: ["egrep", "fgrep"], +} + +cc_binary { + name: "grep", + defaults: ["grep_common"], +} +// 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"], } |