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/resources.hpp b/gui/resources.hpp
old mode 100644
new mode 100755
index 69bebc7..e709e33
--- a/gui/resources.hpp
+++ b/gui/resources.hpp
@@ -1,5 +1,5 @@
/*
- Copyright 2017 TeamWin
+ Copyright 2012 to 2020 TeamWin
This file is part of TWRP/TeamWin Recovery Project.
TWRP is free software: you can redistribute it and/or modify
@@ -25,7 +25,8 @@
#include <vector>
#include <map>
#include "rapidxml.hpp"
-#include "../zipwrap.hpp"
+#include "zipwrap.hpp"
+#include "../minuitwrp/truetype.hpp"
extern "C" {
#include "../minuitwrp/minui.h"
@@ -58,7 +59,7 @@
public:
void* GetResource() { return mFont; }
- int GetHeight() { return gr_ttf_getMaxFontHeight(mFont); }
+ int GetHeight() { return twrpTruetype::gr_ttf_getMaxFontHeight(mFont); }
void Override(xml_node<>* node, ZipWrap* pZip);
protected: