diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2013-09-10 18:07:23 -0700 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2013-09-10 18:07:23 -0700 |
commit | 246daf755a6607db575b5bef13d5cc761d4ebbb0 (patch) | |
tree | dac4527ebb813b4e8b0714e2a506888952cc5fd1 /envsetup.sh | |
parent | 46f00b6167f4c23dd4874abe9377bac85e965b2f (diff) | |
parent | 2b5d2c55bf8c9ced15cfbebe94f0068351f84171 (diff) | |
download | build-246daf755a6607db575b5bef13d5cc761d4ebbb0.zip build-246daf755a6607db575b5bef13d5cc761d4ebbb0.tar.gz build-246daf755a6607db575b5bef13d5cc761d4ebbb0.tar.bz2 |
resolved conflicts for merge of 2b5d2c55 to klp-dev-plus-aosp
Change-Id: Icd9d5eff3f9acba042c100f694309f902c9d56cf
Diffstat (limited to 'envsetup.sh')
-rw-r--r-- | envsetup.sh | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/envsetup.sh b/envsetup.sh index bd66aed..b039bbc 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -603,11 +603,26 @@ function gettop fi } +# Return driver for "make", if any (eg. static analyzer) +function getdriver() +{ + local T="$1" + test "$WITH_STATIC_ANALYZER" = "0" && unset WITH_STATIC_ANALYZER + if [ -n "$WITH_STATIC_ANALYZER" ]; then + echo "\ +$T/prebuilts/clang/linux-x86/host/3.3/tools/scan-build/scan-build \ +--use-analyzer $T/prebuilts/clang/linux-x86/host/3.3/bin/clang \ +--status-bugs \ +--top=$T" + fi +} + function m() { - T=$(gettop) + local T=$(gettop) + local DRV=$(getdriver $T) if [ "$T" ]; then - make -C $T -f build/core/main.mk $@ + $DRV make -C $T -f build/core/main.mk $@ else echo "Couldn't locate the top of the tree. Try setting TOP." fi @@ -632,13 +647,14 @@ function findmakefile() 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 - make $@ + $DRV make $@ else # Find the closest Android.mk file. - T=$(gettop) local M=$(findmakefile) local MODULES= local GET_INSTALL_PATH= @@ -662,14 +678,15 @@ function mm() MODULES=all_modules ARGS=$@ fi - ONE_SHOT_MAKEFILE=$M make -C $T -f build/core/main.mk $MODULES $ARGS + ONE_SHOT_MAKEFILE=$M $DRV make -C $T -f build/core/main.mk $MODULES $ARGS fi fi } function mmm() { - T=$(gettop) + local T=$(gettop) + local DRV=$(getdriver $T) if [ "$T" ]; then local MAKEFILE= local MODULES= @@ -707,7 +724,7 @@ function mmm() ARGS=$GET_INSTALL_PATH MODULES= fi - ONE_SHOT_MAKEFILE="$MAKEFILE" 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 echo "Couldn't locate the top of the tree. Try setting TOP." fi @@ -715,21 +732,23 @@ function mmm() function mma() { + local T=$(gettop) + local DRV=$(getdriver $T) if [ -f build/core/envsetup.mk -a -f Makefile ]; then - make $@ + $DRV make $@ else - T=$(gettop) if [ ! "$T" ]; then echo "Couldn't locate the top of the tree. Try setting TOP." fi local MY_PWD=`PWD= /bin/pwd|sed 's:'$T'/::'` - 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" fi } function mmma() { - T=$(gettop) + local T=$(gettop) + local DRV=$(getdriver $T) if [ "$T" ]; then local DASH_ARGS=$(echo "$@" | awk -v RS=" " -v ORS=" " '/^-.*$/') local DIRS=$(echo "$@" | awk -v RS=" " -v ORS=" " '/^[^-].*$/') @@ -756,7 +775,7 @@ function mmma() esac fi done - 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 echo "Couldn't locate the top of the tree. Try setting TOP." fi |