commit 10abe694783012a99aa4d75318d5588df6937f28
author Brian Carlstrom <bdc@google.com> Sun Oct 04 20:05:54 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Oct 04 20:05:54 2015 +0000
tree 0403f2d09ce8d975920229cb5dd55bfa5710ae0d
parent a9722e29278710c32d84604fd338a4e05ebbb320
parent b43cf69672c72c025f0fe764d49ec950e3b57b81

am b43cf696: am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev

* commit 'b43cf69672c72c025f0fe764d49ec950e3b57b81':
  Use $OUT_DIR/filelist when OUT_DIR is set

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 2ff83f7..0bcccba 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1350,14 +1350,20 @@
         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