Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23bcbf04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add building and installing of grep for vendor."

parents 6794bc7d 0c3b1bd2

shell_and_utilities/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ phony { 
    required: [

        "bzip2",

        "grep",

        "grep_vendor",

        "gzip",

        "mkshrc",

        "mkshrc_vendor",

toolbox/Android.bp

+16 −2
Original line number Diff line number Diff line
@@ -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"],

}