From 72a114a3e16c3dadfb10792b0b9d61d0fb421038 Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Wed, 30 Jan 2019 15:59:53 -0800 Subject: 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 and this requires libfstab as a library, which a few modules did not have before. Test: treehugger Change-Id: I655209a0efb304b3e0568db0748bd5cf7cecbdb7 --- bootloader_message/bootloader_message.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'bootloader_message/bootloader_message.cpp') diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp index b933cbf8e..8c1d63bdd 100644 --- a/bootloader_message/bootloader_message.cpp +++ b/bootloader_message/bootloader_message.cpp @@ -29,6 +29,9 @@ #include #include +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)) { -- cgit v1.2.3