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/gui/pages.cpp b/gui/pages.cpp
old mode 100644
new mode 100755
index fd0ad9b..cc2f615
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -42,14 +42,18 @@
#ifdef USE_MINZIP
#include "../minzip/SysUtil.h"
#else
+#ifdef USE_OTAUTIL_ZIPARCHIVE
#include <otautil/SysUtil.h>
+#else
+#include <ziparchive/zip_archive.h>
+#endif
#endif
extern "C" {
#include "../twcommon.h"
#include "gui.h"
}
-#include "../zipwrap.hpp"
+#include "zipwrap.hpp"
#include "../minuitwrp/minui.h"
#include "rapidxml.hpp"