From d644eb58fde7d39a416850af3caeb4cbce514ec8 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Tue, 13 Jan 2015 21:25:26 -0600 Subject: recovery: autodetect filesystem type * Multiple fstab lines (supported in android) cause recovery to fail to mount partitions if the fs type is not the same as the first fstab entry. So when we attempt to find an fstab entry that matches a path for an f2fs, ext4 or vfat type, check it against blkid's determination of what filesystem type it is. If there is a discrepancy, query fs_mgr for the next possible entry that matches that path until either we find one that is good, or run out of fstab entries. * Also attempt to autodetect the filesystem type for mounting from update.zips. Change-Id: Ib6f4535dd88ef714ae1ca6fb0ffae1c7dac0f7ce --- Android.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 0ae92de..d51e218 100644 --- a/Android.mk +++ b/Android.mk @@ -70,6 +70,7 @@ LOCAL_C_INCLUDES += \ system/vold \ system/extras/ext4_utils \ system/core/adb \ + external/e2fsprogs/lib LOCAL_STATIC_LIBRARIES := \ libext4_utils_static \ @@ -221,7 +222,9 @@ LOCAL_STATIC_LIBRARIES += \ libcutils \ liblog \ libm \ - libc + libc \ + libext2_blkid \ + libext2_uuid LOCAL_C_INCLUDES += \ system/core/fs_mgr/include \ @@ -232,7 +235,8 @@ LOCAL_C_INCLUDES += \ external/libtar/listhash \ external/openssl/include \ external/zlib \ - bionic/libc/bionic + bionic/libc/bionic \ + external/e2fsprogs/lib include $(BUILD_EXECUTABLE) -- cgit v1.1