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

Commit d4e46752 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Move back to BSD grep, and make it available for recovery too." am:... 

Merge "Move back to BSD grep, and make it available for recovery too." am: af7e4567 am: 51c5ef24
am: 38e73d30

Change-Id: Ia8e11923c94b0b48789a73891b84d65eced7cdfe
parents af59892f 38e73d30

shell_and_utilities/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ phony { 
phony {

    name: "shell_and_utilities_recovery",

    required: [

        "grep.recovery",

        "sh.recovery",

        "toolbox.recovery",

        "toybox.recovery",

toolbox/Android.bp

+22 −3
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ cc_binary { 
}



// We build BSD grep separately (but see http://b/111849261).

cc_binary {

    name: "grep",

cc_defaults {

    name: "grep_common",

    defaults: ["toolbox_defaults"],

    srcs: [

        "upstream-netbsd/usr.bin/grep/fastgrep.c",
@@ -72,8 +72,27 @@ cc_binary { 
        "upstream-netbsd/usr.bin/grep/queue.c",

        "upstream-netbsd/usr.bin/grep/util.c",

    ],



    symlinks: [

        "egrep",

        "fgrep",

    ],

    sanitize: {

        integer_overflow: false,

    },

}



cc_binary {

    name: "grep",

    defaults: ["grep_common"],

    recovery_available: true,

}



// 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"],

}