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

Commit 0b584f2b authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am f994458b: am b4b996a8: Merge "Include vendorsetup scripts in order" 

* commit 'f994458b':
  Include vendorsetup scripts in order
parents ea517854 f994458b

envsetup.sh

+2 −2
Original line number Diff line number Diff line
@@ -1487,8 +1487,8 @@ if [ "x$SHELL" != "x/bin/bash" ]; then 
fi



# Execute the contents of any vendorsetup.sh files we can find.

for f in `test -d device && find -L device -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null` \

         `test -d vendor && find -L vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null`

for f in `test -d device && find -L device -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort` \

         `test -d vendor && find -L vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort`

do

    echo "including $f"

    . $f