From 6fa8c3962e1bd1106883e673d3696948b0ae7a2a Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Thu, 22 Sep 2022 23:11:11 +1000
Subject: [PATCH] Build: Fixes for Android

---
 CMakeLists.txt                        | 4 +++-
 src/frontend-common/fullscreen_ui.cpp | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e42f76aa..1f76b5f71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,9 @@ if(USE_WAYLAND)
 endif()
 
 if(ANDROID)
-  set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
+  if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+  endif()
   set(BUILD_NOGUI_FRONTEND OFF)
   set(BUILD_QT_FRONTEND OFF)
   set(BUILD_REGTEST OFF)
diff --git a/src/frontend-common/fullscreen_ui.cpp b/src/frontend-common/fullscreen_ui.cpp
index 28b8cbd72..b80ceedb2 100644
--- a/src/frontend-common/fullscreen_ui.cpp
+++ b/src/frontend-common/fullscreen_ui.cpp
@@ -6123,7 +6123,7 @@ bool FullscreenUI::Initialize()
   if (s_tried_to_initialize)
     return false;
 
-  ImGuiFullscreen::SetTheme();
+  ImGuiFullscreen::SetTheme(false);
   ImGuiFullscreen::UpdateLayoutScale();
 
   if (!ImGuiManager::AddFullscreenFontsIfMissing() || !ImGuiFullscreen::Initialize("images/placeholder.png"))
@@ -6147,6 +6147,11 @@ bool FullscreenUI::HasActiveWindow()
   return false;
 }
 
+void FullscreenUI::CheckForConfigChanges(const Settings& old_settings)
+{
+  // noop
+}
+
 void FullscreenUI::OnSystemStarted()
 {
   // noop