idmap2: switch to improved Result class
Remove the old std::optional based Result class, replace uses with the
new std::variant based Result class.
Test: make idmap2_tests
Change-Id: I401cb36e5af06133a2872d835cf29bfb0b106597
diff --git a/cmds/idmap2/libidmap2/Idmap.cpp b/cmds/idmap2/libidmap2/Idmap.cpp
index ec498ff..a1341fb 100644
--- a/cmds/idmap2/libidmap2/Idmap.cpp
+++ b/cmds/idmap2/libidmap2/Idmap.cpp
@@ -121,7 +121,9 @@
Result<uint32_t> GetCrc(const ZipFile& zip) {
const Result<uint32_t> a = zip.Crc("resources.arsc");
const Result<uint32_t> b = zip.Crc("AndroidManifest.xml");
- return a && b ? Result<uint32_t>(*a ^ *b) : kResultError;
+ return a && b
+ ? Result<uint32_t>(*a ^ *b)
+ : Error("Couldn't get CRC for \"%s\"", a ? "AndroidManifest.xml" : "resources.arsc");
}
} // namespace
@@ -355,9 +357,9 @@
return nullptr;
}
- Result<utils::OverlayManifestInfo> overlay_info =
- utils::ExtractOverlayManifestInfo(overlay_apk_path, out_error);
+ auto overlay_info = utils::ExtractOverlayManifestInfo(overlay_apk_path);
if (!overlay_info) {
+ out_error << "error: " << overlay_info.GetErrorMessage() << std::endl;
return nullptr;
}