diff options
| author | Tom Cherry <tomcherry@google.com> | 2019-01-30 15:59:53 -0800 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2019-01-31 09:00:40 -0800 |
| commit | 72a114a3e16c3dadfb10792b0b9d61d0fb421038 (patch) | |
| tree | 6d6f3af85cfb41d60b688de9e0a9049b37b6f139 /bootloader_message | |
| parent | 9a54dd3bf912894206e71f6b734cea4046917cad (diff) | |
Add android::fs_mgr namespace for new Fstab code
Also add libfstab dependencies where needed. Previously the
`typedef struct FstabEntry Volume;` line served to both define a
`struct FstabEntry` as well as alias Volume to it. With the new
namespace for android::fs_mgr::FstabEntry, `struct FstabEntry` isn't
compatible anymore, so we need to alias Volume to the real
android::fs_mgr::FstabEntry.
In doing so, we need to include <fstab/fstab.h> and this requires
libfstab as a library, which a few modules did not have before.
Test: treehugger
Change-Id: I655209a0efb304b3e0568db0748bd5cf7cecbdb7
Diffstat (limited to 'bootloader_message')
| -rw-r--r-- | bootloader_message/bootloader_message.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp index b933cbf8..8c1d63bd 100644 --- a/bootloader_message/bootloader_message.cpp +++ b/bootloader_message/bootloader_message.cpp @@ -29,6 +29,9 @@ #include <android-base/unique_fd.h> #include <fstab/fstab.h> +using android::fs_mgr::Fstab; +using android::fs_mgr::ReadDefaultFstab; + static std::string get_misc_blk_device(std::string* err) { Fstab fstab; if (!ReadDefaultFstab(&fstab)) { |