Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 029a4bce authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "mma in dirs w/o Android.(mk|bp) in ancestor dir" am: ea01e649 

am: cb69c58b

Change-Id: I0c0eb847796abccc6de635fd51ae45019604ecae
parents eed93f02 cb69c58b

envsetup.sh

+2 −1
Original line number Original line Diff line number Diff line
@@ -742,6 +742,7 @@ function findmakefile() 
        \cd ..

        \cd ..

    done

    done

    \cd $HERE

    \cd $HERE

    return 1

}

}





function mm()

function mm()
@@ -869,7 +870,7 @@ function mma() 
      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

    fi

    fi

    local M=$(findmakefile)

    local M=$(findmakefile || echo $(realpath $PWD)/Android.mk)

    # Remove the path to top as the makefilepath needs to be relative

    # Remove the path to top as the makefilepath needs to be relative

    local M=`echo $M|sed 's:'$T'/::'`

    local M=`echo $M|sed 's:'$T'/::'`

    local MODULES_IN_PATHS=MODULES-IN-$(dirname ${M})

    local MODULES_IN_PATHS=MODULES-IN-$(dirname ${M})