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

Commit 8ed91b66 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix mm and mmm in Android.bp directories"

parents 2eb45d9a 86425257

buildspec.mk.default

+1 −1
Original line number Diff line number Diff line
@@ -105,4 +105,4 @@ endif 
# variable will be changed.  After you have modified this file with the new

# changes (see buildspec.mk.default), update this to the new value from

# buildspec.mk.default.

BUILD_ENV_SEQUENCE_NUMBER := 10
 
BUILD_ENV_SEQUENCE_NUMBER := 11

core/envsetup.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ include $(BUILD_SYSTEM)/version_defaults.mk 
# people who haven't re-run those will have to do so before they

# can build.  Make sure to also update the corresponding value in

# buildspec.mk.default and envsetup.sh.

CORRECT_BUILD_ENV_SEQUENCE_NUMBER := 10

CORRECT_BUILD_ENV_SEQUENCE_NUMBER := 11



# ---------------------------------------------------------------

# The product defaults to generic on hardware

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ endif 
ifneq ($(ONE_SHOT_MAKEFILE),)

# We've probably been invoked by the "mm" shell function

# with a subdirectory's makefile.

include $(ONE_SHOT_MAKEFILE)

include  $(SOONG_ANDROID_MK) $(call filter-soong-makefiles,$(ONE_SHOT_MAKEFILE))

# Change CUSTOM_MODULES to include only modules that were

# defined by this makefile; this will install all of those

# modules as a side-effect.  Do this after including ONE_SHOT_MAKEFILE

envsetup.sh

+22 −9
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ function set_stuff_for_environment() 


function set_sequence_number()

{

    export BUILD_ENV_SEQUENCE_NUMBER=10

    export BUILD_ENV_SEQUENCE_NUMBER=11

}



function settitle()
@@ -749,7 +749,7 @@ function findmakefile() 
    T=

    while [ \( ! \( -f $TOPFILE \) \) -a \( $PWD != "/" \) ]; do

        T=`PWD= /bin/pwd`

        if [ -f "$T/Android.mk" ]; then

        if [ -f "$T/Android.mk" -o -f "$T/Android.bp" ]; then

            echo $T/Android.mk

            \cd $HERE

            return
@@ -791,7 +791,9 @@ function mm() 
              MODULES=

              ARGS=GET-INSTALL-PATH

            else

              MODULES=all_modules

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

              # Convert "/" to "-".

              MODULES=${MODULES//\//-}

              ARGS=$@

            fi

            if [ "1" = "${WITH_TIDY_ONLY}" -o "true" = "${WITH_TIDY_ONLY}" ]; then
@@ -809,18 +811,25 @@ function mmm() 
    if [ "$T" ]; then

        local MAKEFILE=

        local MODULES=

        local MODULES_IN_PATHS=

        local ARGS=

        local DIR TO_CHOP

        local DIR_MODULES

        local GET_INSTALL_PATH=

        local DASH_ARGS=$(echo "$@" | awk -v RS=" " -v ORS=" " '/^-.*$/')

        local DIRS=$(echo "$@" | awk -v RS=" " -v ORS=" " '/^[^-].*$/')

        for DIR in $DIRS ; do

            MODULES=`echo $DIR | sed -n -e 's/.*:\(.*$\)/\1/p' | sed 's/,/ /'`

            if [ "$MODULES" = "" ]; then

                MODULES=all_modules

            fi

            DIR_MODULES=`echo $DIR | sed -n -e 's/.*:\(.*$\)/\1/p' | sed 's/,/ /'`

            DIR=`echo $DIR | sed -e 's/:.*//' -e 's:/$::'`

            if [ -f $DIR/Android.mk ]; then

            # Remove the leading ./ and trailing / if any exists.

            DIR=${DIR#./}

            DIR=${DIR%/}

            if [ -f $DIR/Android.mk -o -f $DIR/Android.bp ]; then

                if [ "$DIR_MODULES" = "" ]; then

                    MODULES_IN_PATHS="$MODULES_IN_PATHS MODULES-IN-$DIR"

                else

                    MODULES="$MODULES $DIR_MODULES"

                fi

                local TO_CHOP=`(\cd -P -- $T && pwd -P) | wc -c | tr -d ' '`

                local TO_CHOP=`expr $TO_CHOP + 1`

                local START=`PWD= /bin/pwd`
@@ -847,11 +856,15 @@ function mmm() 
        if [ -n "$GET_INSTALL_PATH" ]; then

          ARGS=$GET_INSTALL_PATH

          MODULES=

          MODULES_IN_PATHS=

        fi

        if [ "1" = "${WITH_TIDY_ONLY}" -o "true" = "${WITH_TIDY_ONLY}" ]; then

          MODULES=tidy_only

          MODULES_IN_PATHS=

        fi

        ONE_SHOT_MAKEFILE="$MAKEFILE" $DRV make -C $T -f build/core/main.mk $DASH_ARGS $MODULES $ARGS

        # 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

    else

        echo "Couldn't locate the top of the tree.  Try setting TOP."

        return 1