aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Turner <digit@google.com>2015-07-13 21:30:01 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-07-13 21:30:02 +0000
commit33667f4be8dbad8c9180c663811a6df310d950e5 (patch)
treef81de0059f2dc4e84760116adfc74dbacd5bceb1
parent489abd742a9a805ea2bb415c3c3362dddf00ca8c (diff)
parentc7512770383f760a02e4b47779e41b0df5062de6 (diff)
downloadqemu-33667f4be8dbad8c9180c663811a6df310d950e5.tar.gz
Merge "Check for e2fsprogs prebuilts dir in android-configure.sh" into studio-1.4-dev
-rwxr-xr-xandroid-configure.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/android-configure.sh b/android-configure.sh
index bd868bcb9c..9399f1dee0 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -626,6 +626,19 @@ if [ "$OPTION_UI" = "qt" ]; then
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
#