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 --- roots.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'roots.h') diff --git a/roots.h b/roots.h index 341f90529..7b031a188 100644 --- a/roots.h +++ b/roots.h @@ -19,7 +19,9 @@ #include -typedef struct FstabEntry Volume; +#include + +using Volume = android::fs_mgr::FstabEntry; // Load and parse volume data from /etc/recovery.fstab. void load_volume_table(); -- cgit v1.2.3