diff options
| author | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-04-04 15:38:36 +0530 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-13 06:27:20 -0700 |
| commit | f751d253e0f996fc83cac8bdef8d7a469be63283 (patch) | |
| tree | 39ea92930e00fbb7120c10d3d13e7b7992fbe53d | |
| parent | 724feedbd9e668e239e827b974437da85c140313 (diff) | |
| download | build-f751d253e0f996fc83cac8bdef8d7a469be63283.zip build-f751d253e0f996fc83cac8bdef8d7a469be63283.tar.gz build-f751d253e0f996fc83cac8bdef8d7a469be63283.tar.bz2 | |
envsetup: allow using mka for mm{,m}
Change-Id: I6c0fce5e67a3b5c49023d3c00825e35b08d41845
| -rw-r--r-- | envsetup.sh | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/envsetup.sh b/envsetup.sh index 49e1fb4..c80c777 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -792,10 +792,17 @@ function findmakefile() function mm() { + local MM_MAKE=make + local ARG= + for ARG in $@ ; do + if [ "$ARG" = mka ]; then + MM_MAKE=mka + fi + done # 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 $@ + $MM_MAKE $@ else # Find the closest Android.mk file. T=$(gettop) @@ -807,13 +814,14 @@ function mm() elif [ ! "$M" ]; then echo "Couldn't locate a makefile from the current directory." else - ONE_SHOT_MAKEFILE=$M make -C $T all_modules $@ + ONE_SHOT_MAKEFILE=$M $MM_MAKE -C $T all_modules $@ fi fi } function mmm() { + local MMM_MAKE=make T=$(gettop) if [ "$T" ]; then local MAKEFILE= @@ -848,13 +856,15 @@ function mmm() ARGS="$ARGS dist" elif [ "$DIR" = incrementaljavac ]; then ARGS="$ARGS incrementaljavac" + elif [ "$DIR" = mka ]; then + MMM_MAKE=mka else echo "No Android.mk in $DIR." return 1 fi fi done - ONE_SHOT_MAKEFILE="$MAKEFILE" make -C $T $DASH_ARGS $MODULES $ARGS + ONE_SHOT_MAKEFILE="$MAKEFILE" $MMM_MAKE -C $T $DASH_ARGS $MODULES $ARGS else echo "Couldn't locate the top of the tree. Try setting TOP." fi |