Merge "Return non-zero if can't locate top of the tree in m/mm/mmm." (24a71e15) · Commits · e / os / android_build

envsetup.sh

+6 −0

Original line number	Diff line number	Diff line
		@@ -672,6 +672,7 @@ function m()
		$DRV make -C $T -f build/core/main.mk $@
		else
		echo "Couldn't locate the top of the tree. Try setting TOP."
		return 1
		fi
		}

		@@ -710,8 +711,10 @@ function mm()
		local M=`echo $M\|sed 's:'$T'/::'`
		if [ ! "$T" ]; then
		echo "Couldn't locate the top of the tree. Try setting TOP."
		return 1
		elif [ ! "$M" ]; then
		echo "Couldn't locate a makefile from the current directory."
		return 1
		else
		for ARG in $@; do
		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
		else
		echo "Couldn't locate the top of the tree. Try setting TOP."
		return 1
		fi
		}

		@@ -786,6 +790,7 @@ function mma()
		else
		if [ ! "$T" ]; then
		echo "Couldn't locate the top of the tree. Try setting TOP."
		return 1
		fi
		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"
		@@ -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"
		else
		echo "Couldn't locate the top of the tree. Try setting TOP."
		return 1
		fi
		}