commit 55c838f11580c8954730809ff8931483733e13a0
author Ying Wang <wangying@android.com> Sat Apr 04 21:40:06 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Apr 04 21:40:06 2015 +0000
tree 217ac05bd687dd1dbcacd21a7782d1d2f6c20e44
parent 11e923a0e545ac6935f471e1ed894a6a270cd346
parent 0b584f2b394051684e2506cc7304b583df29bca6

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

* commit '0b584f2b394051684e2506cc7304b583df29bca6':
  Include vendorsetup scripts in order

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 83b4afd..7efbe39 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1492,8 +1492,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