Merge "Stop using make wrapper around soong_ui" am: 80c05c518b (f734d097) · Commits · e / os / android_build

envsetup.sh

+25 −15

Original line number	Diff line number	Diff line
		@@ -743,7 +743,7 @@ function m()
		local T=$(gettop)
		local DRV=$(getdriver $T)
		if [ "$T" ]; then
		$DRV make -C $T -f build/core/main.mk $@
		_wrap_build $DRV $T/build/soong/soong_ui.bash --make-mode $@
		else
		echo "Couldn't locate the top of the tree. Try setting TOP."
		return 1
		@@ -772,9 +772,9 @@ function mm()
		local T=$(gettop)
		local DRV=$(getdriver $T)
		# If we're sitting in the root of the build tree, just do a
		# normal make.
		if [ -f build/core/envsetup.mk -a -f Makefile ]; then
		$DRV make $@
		# normal build.
		if [ -f build/soong/soong_ui.bash ]; then
		_wrap_build $DRV $T/build/soong/soong_ui.bash --make-mode $@
		else
		# Find the closest Android.mk file.
		local M=$(findmakefile)
		@@ -809,7 +809,7 @@ function mm()
		if [ "1" = "${WITH_TIDY_ONLY}" -o "true" = "${WITH_TIDY_ONLY}" ]; then
		MODULES=tidy_only
		fi
		ONE_SHOT_MAKEFILE=$M $DRV make -C $T -f build/core/main.mk $MODULES $ARGS
		ONE_SHOT_MAKEFILE=$M _wrap_build $DRV $T/build/soong/soong_ui.bash --make-mode $MODULES $ARGS
		fi
		fi
		}
		@@ -877,7 +877,7 @@ function mmm()
		fi
		# Convert "/" to "-".
		MODULES_IN_PATHS=${MODULES_IN_PATHS//\//-}
		ONE_SHOT_MAKEFILE="$MAKEFILE" $DRV make -C $T -f build/core/main.mk $DASH_ARGS $MODULES $MODULES_IN_PATHS $ARGS
		ONE_SHOT_MAKEFILE="$MAKEFILE" _wrap_build $DRV $T/build/soong/soong_ui.bash --make-mode $DASH_ARGS $MODULES $MODULES_IN_PATHS $ARGS
		else
		echo "Couldn't locate the top of the tree. Try setting TOP."
		return 1
		@@ -888,8 +888,8 @@ function mma()
		{
		local T=$(gettop)
		local DRV=$(getdriver $T)
		if [ -f build/core/envsetup.mk -a -f Makefile ]; then
		$DRV make $@
		if [ -f build/soong/soong_ui.bash ]; then
		_wrap_build $DRV $T/build/soong/soong_ui.bash --make-mode $@
		else
		if [ ! "$T" ]; then
		echo "Couldn't locate the top of the tree. Try setting TOP."
		@@ -901,7 +901,7 @@ function mma()
		local MODULES_IN_PATHS=MODULES-IN-$(dirname ${M})
		# Convert "/" to "-".
		MODULES_IN_PATHS=${MODULES_IN_PATHS//\//-}
		$DRV make -C $T -f build/core/main.mk $@ $MODULES_IN_PATHS
		_wrap_build $DRV $T/build/soong/soong_ui.bash --make-mode $@ $MODULES_IN_PATHS
		fi
		}

		@@ -939,7 +939,7 @@ function mmma()
		done
		# Convert "/" to "-".
		MODULES_IN_PATHS=${MODULES_IN_PATHS//\//-}
		$DRV make -C $T -f build/core/main.mk $DASH_ARGS $ARGS $MODULES_IN_PATHS
		_wrap_build $DRV $T/build/soong/soong_ui.bash --make-mode $DASH_ARGS $ARGS $MODULES_IN_PATHS
		else
		echo "Couldn't locate the top of the tree. Try setting TOP."
		return 1
		@@ -1585,13 +1585,18 @@ function pez {

		function get_make_command()
		{
		# If we're in the top of an Android tree, use soong_ui.bash instead of make
		if [ -f build/soong/soong_ui.bash ]; then
		echo build/soong/soong_ui.bash --make-mode
		else
		echo command make
		fi
		}

		function make()
		function _wrap_build()
		{
		local start_time=$(date +"%s")
		$(get_make_command) "$@"
		"$@"
		local ret=$?
		local end_time=$(date +"%s")
		local tdiff=$(($end_time-$start_time))
		@@ -1610,9 +1615,9 @@ function make()
		fi
		echo
		if [ $ret -eq 0 ] ; then
		echo -n "${color_success}#### make completed successfully "
		echo -n "${color_success}#### build completed successfully "
		else
		echo -n "${color_failed}#### make failed to build some targets "
		echo -n "${color_failed}#### failed to build some targets "
		fi
		if [ $hours -gt 0 ] ; then
		printf "(%02g:%02g:%02g (hh:mm:ss))" $hours $mins $secs
		@@ -1626,6 +1631,11 @@ function make()
		return $ret
		}

		function make()
		{
		_wrap_build $(get_make_command) "$@"
		}

		function provision()
		{
		if [ ! "$ANDROID_PRODUCT_OUT" ]; then