StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Teach mgrep to find soong/*.go files." am: 46d9bf8f9a am: bb67e3ae54

Browse Source 
am: f515b91b3f

Change-Id: Idfa23df410e92a6afa7953cceb2286b3b994bbee
This commit is contained in:
David Gross
2017-05-18 18:25:39 +00:00
committed by android-build-merger
parent 1a48fbca55 f515b91b3f
commit d5b0f9abe6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
envsetup.sh
View File

@@ -1243,7 +1243,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 "$@" {} +
} }
@@ -1257,7 +1257,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 "$@" {} +
} }