Merge "Teach mgrep to find soong/*.go files."

am: 46d9bf8f9a

Change-Id: I22910cf7fe9b08b2b98994e60a96769f90b680f7
This commit is contained in:
David Gross
2017-05-18 18:17:07 +00:00
committed by android-build-merger

View File

@@ -1241,7 +1241,7 @@ case `uname -s` in
Darwin) Darwin)
function mgrep() function mgrep()
{ {
find -E . -name .repo -prune -o -name .git -prune -o -path ./out -prune -o -type f -iregex '.*/(Makefile|Makefile\..*|.*\.make|.*\.mak|.*\.mk|.*\.bp)' \ find -E . -name .repo -prune -o -name .git -prune -o -path ./out -prune -o \( -iregex '.*/(Makefile|Makefile\..*|.*\.make|.*\.mak|.*\.mk|.*\.bp)' -o -regex '(.*/)?soong/[^/]*.go' \) -type f \
-exec grep --color -n "$@" {} + -exec grep --color -n "$@" {} +
} }
@@ -1255,7 +1255,7 @@ case `uname -s` in
*) *)
function mgrep() function mgrep()
{ {
find . -name .repo -prune -o -name .git -prune -o -path ./out -prune -o -regextype posix-egrep -iregex '(.*\/Makefile|.*\/Makefile\..*|.*\.make|.*\.mak|.*\.mk|.*\.bp)' -type f \ find . -name .repo -prune -o -name .git -prune -o -path ./out -prune -o \( -regextype posix-egrep -iregex '(.*\/Makefile|.*\/Makefile\..*|.*\.make|.*\.mak|.*\.mk|.*\.bp)' -o -regextype posix-extended -regex '(.*/)?soong/[^/]*.go' \) -type f \
-exec grep --color -n "$@" {} + -exec grep --color -n "$@" {} +
} }