commit 33667f4be8dbad8c9180c663811a6df310d950e5
author David Turner <digit@google.com> Mon Jul 13 21:30:01 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 13 21:30:02 2015 +0000
tree f81de0059f2dc4e84760116adfc74dbacd5bceb1
parent 489abd742a9a805ea2bb415c3c3362dddf00ca8c
parent c7512770383f760a02e4b47779e41b0df5062de6

Merge "Check for e2fsprogs prebuilts dir in android-configure.sh" into studio-1.4-dev

android-configure.sh

diff --git a/android-configure.sh b/android-configure.sh
index bd868bc..9399f1d 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -626,6 +626,19 @@
     fi
 fi
 
+###
+###  e2fsprogs probe
+###
+E2FSPROGS_PREBUILTS_DIR=
+if true; then
+    E2FSPROGS_PREBUILTS_DIR=$AOSP_PREBUILTS_DIR/android-emulator-build/e2fsprogs
+    if [ -d "$E2FSPROGS_PREBUILTS_DIR" ]; then
+        log "e2fsprogs prebuilts dir: $E2FSPROGS_PREBUILTS_DIR"
+    else
+        echo "WARNING: Missing e2fsprogs prebuilts directory: $E2FSPROGS_PREBUILTS_DIR"
+    fi
+fi
+
 # create the objs directory that is going to contain all generated files
 # including the configuration ones
 #