diff options
| author | Ying Wang <wangying@android.com> | 2015-04-04 21:10:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-04 21:10:43 +0000 |
| commit | f994458babc78670263085b027bfaa34ff0bc52a (patch) | |
| tree | 7dd949d3a79feab945e51609b2ef813045a58e27 | |
| parent | aacc8bb4efb993e1d5ae539aa154c60d84a926dc (diff) | |
| parent | b4b996a8ee26553e29f7610f97041753ddff3e68 (diff) | |
| download | build-f994458babc78670263085b027bfaa34ff0bc52a.zip build-f994458babc78670263085b027bfaa34ff0bc52a.tar.gz build-f994458babc78670263085b027bfaa34ff0bc52a.tar.bz2 | |
am b4b996a8: Merge "Include vendorsetup scripts in order"
* commit 'b4b996a8ee26553e29f7610f97041753ddff3e68':
Include vendorsetup scripts in order
| -rw-r--r-- | envsetup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/envsetup.sh b/envsetup.sh index bd77895..bec6993 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 |