diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:07:58 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:07:58 +0000 |
| commit | 766a518ae6de4b81c4fc139f90b51521a2f681b7 (patch) | |
| tree | e694616b3a0c42642ed38f396cba9ba5e5ff8671 /envsetup.sh | |
| parent | 5cd236c279a16120cabc9e334285277f9e79f213 (diff) | |
| parent | 358c8909f5dd043f9d8bfee61f567701946dc19a (diff) | |
| download | build-766a518ae6de4b81c4fc139f90b51521a2f681b7.zip build-766a518ae6de4b81c4fc139f90b51521a2f681b7.tar.gz build-766a518ae6de4b81c4fc139f90b51521a2f681b7.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
core/Makefile
core/build_id.mk
tools/releasetools/ota_from_target_files.py
Change-Id: Ia1404ee9cd931a6540ea0dd3e2aa7b32d649e80c
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/envsetup.sh b/envsetup.sh index 4ce7d3b..8eb22cf 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1625,14 +1625,20 @@ function godir () { return fi T=$(gettop) - if [[ ! -f $T/filelist ]]; then + if [ ! "$OUT_DIR" = "" ]; then + mkdir -p $OUT_DIR + FILELIST=$OUT_DIR/filelist + else + FILELIST=$T/filelist + fi + if [[ ! -f $FILELIST ]]; then echo -n "Creating index..." - (\cd $T; find . -wholename ./out -prune -o -wholename ./.repo -prune -o -type f > filelist) + (\cd $T; find . -wholename ./out -prune -o -wholename ./.repo -prune -o -type f > $FILELIST) echo " Done" echo "" fi local lines - lines=($(\grep "$1" $T/filelist | sed -e 's/\/[^/]*$//' | sort | uniq)) + lines=($(\grep "$1" $FILELIST | sed -e 's/\/[^/]*$//' | sort | uniq)) if [[ ${#lines[@]} = 0 ]]; then echo "Not found" return |