commit f994458babc78670263085b027bfaa34ff0bc52a
author Ying Wang <wangying@android.com> Sat Apr 04 21:10:43 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Apr 04 21:10:43 2015 +0000
tree 7dd949d3a79feab945e51609b2ef813045a58e27
parent aacc8bb4efb993e1d5ae539aa154c60d84a926dc
parent b4b996a8ee26553e29f7610f97041753ddff3e68

am b4b996a8: Merge "Include vendorsetup scripts in order"

* commit 'b4b996a8ee26553e29f7610f97041753ddff3e68':
  Include vendorsetup scripts in order

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index bd77895..bec6993 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1487,8 +1487,8 @@
 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