p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 8b6fabc4: am 18aad5fe: am 24a71e15: Merge "Return non-zero if can\'t locate top of the tree in m/mm/mmm." 

* commit '8b6fabc4619f6b1c5c4c1834783268bea0e77afc':
  Return non-zero if can't locate top of the tree in m/mm/mmm.
This commit is contained in:
Ying Wang 2015-04-02 01:40:19 +00:00 committed by Android Git Automerger
parent 55ae50dc1d 8b6fabc461
commit 131d2f15c8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
envsetup.sh
View File

@ -672,6 +672,7 @@ function m()
$DRV make -C $T -f build/core/main.mk $@ $DRV make -C $T -f build/core/main.mk $@
else else
echo "Couldn't locate the top of the tree. Try setting TOP." echo "Couldn't locate the top of the tree. Try setting TOP."
return 1
fi fi
} }
@ -710,8 +711,10 @@ function mm()
local M=`echo $M|sed 's:'$T'/::'` local M=`echo $M|sed 's:'$T'/::'`
if [ ! "$T" ]; then if [ ! "$T" ]; then
echo "Couldn't locate the top of the tree. Try setting TOP." echo "Couldn't locate the top of the tree. Try setting TOP."
return 1
elif [ ! "$M" ]; then elif [ ! "$M" ]; then
echo "Couldn't locate a makefile from the current directory." echo "Couldn't locate a makefile from the current directory."
return 1
else else
for ARG in $@; do for ARG in $@; do
case $ARG in case $ARG in
@ -774,6 +777,7 @@ function mmm()
ONE_SHOT_MAKEFILE="$MAKEFILE" $DRV make -C $T -f build/core/main.mk $DASH_ARGS $MODULES $ARGS ONE_SHOT_MAKEFILE="$MAKEFILE" $DRV make -C $T -f build/core/main.mk $DASH_ARGS $MODULES $ARGS
else else
echo "Couldn't locate the top of the tree. Try setting TOP." echo "Couldn't locate the top of the tree. Try setting TOP."
return 1
fi fi
} }
@ -786,6 +790,7 @@ function mma()
else else
if [ ! "$T" ]; then if [ ! "$T" ]; then
echo "Couldn't locate the top of the tree. Try setting TOP." echo "Couldn't locate the top of the tree. Try setting TOP."
return 1
fi fi
local MY_PWD=`PWD= /bin/pwd|sed 's:'$T'/::'` local MY_PWD=`PWD= /bin/pwd|sed 's:'$T'/::'`
$DRV make -C $T -f build/core/main.mk $@ all_modules BUILD_MODULES_IN_PATHS="$MY_PWD" $DRV make -C $T -f build/core/main.mk $@ all_modules BUILD_MODULES_IN_PATHS="$MY_PWD"
@ -825,6 +830,7 @@ function mmma()
$DRV make -C $T -f build/core/main.mk $DASH_ARGS $ARGS all_modules BUILD_MODULES_IN_PATHS="$MODULE_PATHS" $DRV make -C $T -f build/core/main.mk $DASH_ARGS $ARGS all_modules BUILD_MODULES_IN_PATHS="$MODULE_PATHS"
else else
echo "Couldn't locate the top of the tree. Try setting TOP." echo "Couldn't locate the top of the tree. Try setting TOP."
return 1
fi fi
} }