tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Stop using make wrapper around soong_ui"

Browse source 
am: 80c05c518b

Change-Id: I74b69fd1c6f6fd2a9feb9807770577b523656fb8
This commit is contained in:
Dan Willemsen 2017-07-13 21:41:26 +00:00 committed by android-build-merger
commit 757926d509
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
envsetup.sh
View file

@ -743,7 +743,7 @@ function m()
local T=$(gettop) local T=$(gettop)
local DRV=$(getdriver $T) local DRV=$(getdriver $T)
if [ "$T" ]; then if [ "$T" ]; then
$DRV make -C $T -f build/core/main.mk $@ _wrap_build $DRV $T/build/soong/soong_ui.bash --make-mode $@
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 return 1
@ -772,9 +772,9 @@ function mm()
local T=$(gettop) local T=$(gettop)
local DRV=$(getdriver $T) local DRV=$(getdriver $T)
# If we're sitting in the root of the build tree, just do a # If we're sitting in the root of the build tree, just do a
# normal make. # normal build.
if [ -f build/core/envsetup.mk -a -f Makefile ]; then if [ -f build/soong/soong_ui.bash ]; then
$DRV make $@ _wrap_build $DRV $T/build/soong/soong_ui.bash --make-mode $@
else else
# Find the closest Android.mk file. # Find the closest Android.mk file.
local M=$(findmakefile) local M=$(findmakefile)
@ -809,7 +809,7 @@ function mm()
if [ "1" = "${WITH_TIDY_ONLY}" -o "true" = "${WITH_TIDY_ONLY}" ]; then if [ "1" = "${WITH_TIDY_ONLY}" -o "true" = "${WITH_TIDY_ONLY}" ]; then
MODULES=tidy_only MODULES=tidy_only
fi 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
fi fi
} }
@ -877,7 +877,7 @@ function mmm()
fi fi
# Convert "/" to "-". # Convert "/" to "-".
MODULES_IN_PATHS=${MODULES_IN_PATHS//\//-} 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 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 return 1
@ -888,8 +888,8 @@ function mma()
{ {
local T=$(gettop) local T=$(gettop)
local DRV=$(getdriver $T) local DRV=$(getdriver $T)
if [ -f build/core/envsetup.mk -a -f Makefile ]; then if [ -f build/soong/soong_ui.bash ]; then
$DRV make $@ _wrap_build $DRV $T/build/soong/soong_ui.bash --make-mode $@
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."
@ -901,7 +901,7 @@ function mma()
local MODULES_IN_PATHS=MODULES-IN-$(dirname ${M}) local MODULES_IN_PATHS=MODULES-IN-$(dirname ${M})
# Convert "/" to "-". # Convert "/" to "-".
MODULES_IN_PATHS=${MODULES_IN_PATHS//\//-} 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 fi
} }
@ -939,7 +939,7 @@ function mmma()
done done
# Convert "/" to "-". # Convert "/" to "-".
MODULES_IN_PATHS=${MODULES_IN_PATHS//\//-} 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 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 return 1
@ -1585,13 +1585,18 @@ function pez {
function get_make_command() function get_make_command()
{ {
echo command make # 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") local start_time=$(date +"%s")
$(get_make_command) "$@" "$@"
local ret=$? local ret=$?
local end_time=$(date +"%s") local end_time=$(date +"%s")
local tdiff=$(($end_time-$start_time)) local tdiff=$(($end_time-$start_time))
@ -1610,9 +1615,9 @@ function make()
fi fi
echo echo
if [ $ret -eq 0 ] ; then if [ $ret -eq 0 ] ; then
echo -n "${color_success}#### make completed successfully " echo -n "${color_success}#### build completed successfully "
else else
echo -n "${color_failed}#### make failed to build some targets " echo -n "${color_failed}#### failed to build some targets "
fi fi
if [ $hours -gt 0 ] ; then if [ $hours -gt 0 ] ; then
printf "(%02g:%02g:%02g (hh:mm:ss))" $hours $mins $secs printf "(%02g:%02g:%02g (hh:mm:ss))" $hours $mins $secs
@ -1626,6 +1631,11 @@ function make()
return $ret return $ret
} }
function make()
{
_wrap_build $(get_make_command) "$@"
}
function provision() function provision()
{ {
if [ ! "$ANDROID_PRODUCT_OUT" ]; then if [ ! "$ANDROID_PRODUCT_OUT" ]; then