AOSP10 TWRP Merge: fix conflicts and update libraries needed
This allows flame to boot TWRP. Still will need to work on
super partition for vendor and system access.
The plan will be to cherry-pick any updates to android-9.0
through gerrit.twrp.me to this branch as a WIP.
diff --git a/twinstall.cpp b/twinstall.cpp
index d659b47..fb639a7 100755
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -41,14 +41,16 @@
#ifdef USE_MINZIP
#include "minzip/SysUtil.h"
#else
-#include "otautil/SysUtil.h"
+#include "otautil/sysutil.h"
#include <ziparchive/zip_archive.h>
#endif
#include "zipwrap.hpp"
#ifdef USE_OLD_VERIFIER
#include "verifier24/verifier.h"
+#elif USE_28_VERIFIER
+#include "verifier28/verifier.h"
#else
-#include "verifier.h"
+#include "install/verifier.h"
#endif
#include "variables.h"
#include "data.hpp"