Merge "Move back to BSD grep, and make it available for recovery too." (af7e4567) · Commits · e / os / android_system_core

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

+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"],
		}