diff options
| author | David Turner <digit@google.com> | 2015-07-13 21:31:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-07-13 21:31:46 +0000 |
| commit | 88a6f5c6b97abf43f1ce097f67c8508fd4f49909 (patch) | |
| tree | c03b6e1889706c30008c743dc30faf32d82c15bd | |
| parent | 1e11d53d9a5276f4c20e2d59225f62f918db278c (diff) | |
| parent | 33667f4be8dbad8c9180c663811a6df310d950e5 (diff) | |
| download | qemu-88a6f5c6b97abf43f1ce097f67c8508fd4f49909.tar.gz | |
Merge "Check for e2fsprogs prebuilts dir in android-configure.sh" into studio-1.4-dev
automerge: 33667f4
* commit '33667f4be8dbad8c9180c663811a6df310d950e5':
Check for e2fsprogs prebuilts dir in android-configure.sh
| -rwxr-xr-x | android-configure.sh | 13 |
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 # |