From 15760a8a965c63276b93918df3fb050da2df2a3b Mon Sep 17 00:00:00 2001
From: Oleksiy Avramchenko <oleksiy.avramchenko@sonymobile.com>
Date: Mon, 6 Oct 2014 18:51:58 +0200
Subject: [PATCH] Include vendorsetup scripts in order

This fixes randomness of the combo index.

Change-Id: I533161fea8d1bc0c9dbd6ca2f3393d27310c9588
---
 envsetup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/envsetup.sh b/envsetup.sh
index bd77895e0c..bec69932d7 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -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