commit 15760a8a965c63276b93918df3fb050da2df2a3b
author Oleksiy Avramchenko <oleksiy.avramchenko@sonymobile.com> Mon Oct 06 18:51:58 2014 +0200
committer Johan Redestig <johan.redestig@sonymobile.com> Fri Apr 03 11:58:09 2015 +0200
tree 16cf3252a6bc3e2366ecbceaa17355b32157e453
parent 62003acdcc2ecdc13ce2a9880c35147d2070e865

Include vendorsetup scripts in order

This fixes randomness of the combo index.

Change-Id: I533161fea8d1bc0c9dbd6ca2f3393d27310c9588

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