From 0dcc1b18d6cb224eba3c94785c65c6ae4b3bc6a2 Mon Sep 17 00:00:00 2001
From: Triang3l <triang3l@yandex.ru>
Date: Sat, 21 Nov 2020 23:13:30 +0300
Subject: [PATCH 1/2] [Android] Remove releaseDebuggable config since
 debuggable disables optimization

---
 android/android_studio_project/app/build.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/android/android_studio_project/app/build.gradle b/android/android_studio_project/app/build.gradle
index 6ba02485c..972b76641 100644
--- a/android/android_studio_project/app/build.gradle
+++ b/android/android_studio_project/app/build.gradle
@@ -33,10 +33,6 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
-        releaseDebuggable {
-            initWith release
-            debuggable true
-        }
         debug {
             applicationIdSuffix ".debug"
             debuggable true

From 233daa018de3ee0cbae1adefab90dbe47d612d47 Mon Sep 17 00:00:00 2001
From: Triang3l <triang3l@yandex.ru>
Date: Sat, 21 Nov 2020 23:40:34 +0300
Subject: [PATCH 2/2] [Build] Enable exceptions and Clang STL on Android

---
 premake5.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/premake5.lua b/premake5.lua
index 7b8083a7e..a9095c591 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -29,6 +29,7 @@ defines({
 })
 
 cppdialect("C++17")
+exceptionhandling("On")
 symbols("On")
 
 -- TODO(DrChat): Find a way to disable this on other architectures.
@@ -146,6 +147,9 @@ filter({"platforms:Linux", "language:C++", "toolset:clang", "files:*.cc or *.cpp
     "-stdlib=libstdc++",
   })
 
+filter("platforms:Android")
+  system("android")
+
 filter("platforms:Windows")
   system("windows")
   toolset("msc")
@@ -198,8 +202,9 @@ solution("xenia")
   uuid("931ef4b0-6170-4f7a-aaf2-0fece7632747")
   startproject("xenia-app")
   if os.istarget("android") then
-    architecture("ARM64")
+    -- Not setting architecture as that's handled by ndk-build itself.
     platforms({"Android"})
+    ndkstl("c++_static")
   else
     architecture("x86_64")
     if os.istarget("linux") then