Merge "Bypass alias for grep in the tapas command."
This commit is contained in:
committed by
Android (Google) Code Review
commit
86624bf608
@@ -1104,7 +1104,7 @@ $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;
|
|||||||
rm -rf $$ldir; \
|
rm -rf $$ldir; \
|
||||||
mkdir -p $$ldir; \
|
mkdir -p $$ldir; \
|
||||||
filelist=; \
|
filelist=; \
|
||||||
for f in `$(HOST_AR) t $(1) | grep '\.o$$'`; do \
|
for f in `$(HOST_AR) t $(1) | \grep '\.o$$'`; do \
|
||||||
$(HOST_AR) p $(1) $$f > $$ldir/$$f; \
|
$(HOST_AR) p $(1) $$f > $$ldir/$$f; \
|
||||||
filelist="$$filelist $$ldir/$$f"; \
|
filelist="$$filelist $$ldir/$$f"; \
|
||||||
done ; \
|
done ; \
|
||||||
|
@@ -502,8 +502,8 @@ complete -F _lunch lunch
|
|||||||
# Run tapas with one ore more app names (from LOCAL_PACKAGE_NAME)
|
# Run tapas with one ore more app names (from LOCAL_PACKAGE_NAME)
|
||||||
function tapas()
|
function tapas()
|
||||||
{
|
{
|
||||||
local variant=$(echo -n $(echo $* | xargs -n 1 echo | grep -E '^(user|userdebug|eng)$'))
|
local variant=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$'))
|
||||||
local apps=$(echo -n $(echo $* | xargs -n 1 echo | grep -E -v '^(user|userdebug|eng)$'))
|
local apps=$(echo -n $(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng)$'))
|
||||||
|
|
||||||
if [ $(echo $variant | wc -w) -gt 1 ]; then
|
if [ $(echo $variant | wc -w) -gt 1 ]; then
|
||||||
echo "tapas: Error: Multiple build variants supplied: $variant"
|
echo "tapas: Error: Multiple build variants supplied: $variant"
|
||||||
@@ -1015,7 +1015,7 @@ function godir () {
|
|||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
local lines
|
local lines
|
||||||
lines=($(grep "$1" $T/filelist | sed -e 's/\/[^/]*$//' | sort | uniq))
|
lines=($(\grep "$1" $T/filelist | sed -e 's/\/[^/]*$//' | sort | uniq))
|
||||||
if [[ ${#lines[@]} = 0 ]]; then
|
if [[ ${#lines[@]} = 0 ]]; then
|
||||||
echo "Not found"
|
echo "Not found"
|
||||||
return
|
return
|
||||||
|
Reference in New Issue
Block a user