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

Commit 61cd884a authored by Ying Wang's avatar Ying Wang
Browse files

Substitue "/" with "-" in the MODULES-IN phony goal names. 

This avoids Ninja's path canonicalization on those goal names.
Without this, Ninja complains about duplicate rules for
MODULES-IN/a/b/.. and MODULES-IN/a.

Bug: 24309760
Change-Id: Id3aa9da5d3887a2cd1426cbb5fdf35659c65805e
parent 43bbbf8a

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ $(my_register_name): $(LOCAL_BUILT_MODULE) $(LOCAL_INSTALLED_MODULE) 
my_path_components := $(subst /,$(space),$(LOCAL_PATH))

my_path_prefix := MODULES-IN

$(foreach c, $(my_path_components),\

  $(eval my_path_prefix := $(my_path_prefix)/$(c))\

  $(eval my_path_prefix := $(my_path_prefix)-$(c))\

  $(eval .PHONY : $(my_path_prefix))\

  $(eval $(my_path_prefix) : $(my_register_name)))

envsetup.sh

+7 −2
Original line number Diff line number Diff line
@@ -780,7 +780,10 @@ function mma() 
      return 1

    fi

    local MY_PWD=`PWD= /bin/pwd|sed 's:'$T'/::'`

    $DRV make -C $T -f build/core/main.mk $@ MODULES-IN/$MY_PWD

    local MODULES_IN_PATHS=MODULES-IN-$MY_PWD

    # Convert "/" to "-".

    MODULES_IN_PATHS=${MODULES_IN_PATHS//\//-}

    $DRV make -C $T -f build/core/main.mk $@ $MODULES_IN_PATHS

  fi

}
@@ -808,7 +811,7 @@ function mmma() 
        if [ "$MY_PWD" != "" ]; then

          DIR=$MY_PWD/$DIR

        fi

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

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

      else

        case $DIR in

          showcommands | snod | dist | *=*) ARGS="$ARGS $DIR";;
@@ -816,6 +819,8 @@ function mmma() 
        esac

      fi

    done

    # Convert "/" to "-".

    MODULES_IN_PATHS=${MODULES_IN_PATHS//\//-}

    $DRV make -C $T -f build/core/main.mk $DASH_ARGS $ARGS $MODULES_IN_PATHS

  else

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