diff options
| author | Ying Wang <wangying@android.com> | 2015-04-04 21:40:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-04 21:40:06 +0000 |
| commit | 55c838f11580c8954730809ff8931483733e13a0 (patch) | |
| tree | 217ac05bd687dd1dbcacd21a7782d1d2f6c20e44 /envsetup.sh | |
| parent | 11e923a0e545ac6935f471e1ed894a6a270cd346 (diff) | |
| parent | 0b584f2b394051684e2506cc7304b583df29bca6 (diff) | |
| download | platform_build-55c838f11580c8954730809ff8931483733e13a0.tar.gz platform_build-55c838f11580c8954730809ff8931483733e13a0.tar.bz2 platform_build-55c838f11580c8954730809ff8931483733e13a0.zip | |
am 0b584f2b: am f994458b: am b4b996a8: Merge "Include vendorsetup scripts in order"
* commit '0b584f2b394051684e2506cc7304b583df29bca6':
Include vendorsetup scripts in order
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/envsetup.sh b/envsetup.sh index 83b4afdddf..7efbe399b0 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1492,8 +1492,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 |