From a22a8dce1cb3de2d87bfab329ae04692439c6628 Mon Sep 17 00:00:00 2001
From: Jupeyy <jupjopjap@gmail.com>
Date: Sat, 25 Jun 2022 10:12:56 +0200
Subject: [PATCH] Fix Android build

---
 scripts/android/cmake_android.sh                | 4 ++--
 scripts/android/files/build.gradle              | 2 +-
 scripts/android/files/gradle-wrapper.properties | 2 +-
 src/base/log.cpp                                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/android/cmake_android.sh b/scripts/android/cmake_android.sh
index 553bf6f6b..9f0b242e1 100755
--- a/scripts/android/cmake_android.sh
+++ b/scripts/android/cmake_android.sh
@@ -104,8 +104,8 @@ function build_for_type() {
 		-DTOOLS=OFF \
 		-DDEV=TRUE \
 		-DCMAKE_CROSSCOMPILING=ON \
-		-DPREFER_BUNDLED_LIBS=ON \
-		-DVULKAN=ON
+		-DVULKAN=ON \
+		-DVIDEORECORDER=OFF
 	(
 		cd "build_android/$_ANDROID_SUB_BUILD_DIR/$1" || exit 1
 		cmake --build . --target DDNet
diff --git a/scripts/android/files/build.gradle b/scripts/android/files/build.gradle
index 389d2cdbc..417e1b23d 100644
--- a/scripts/android/files/build.gradle
+++ b/scripts/android/files/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 	}
 	
 	dependencies {
-		classpath 'com.android.tools.build:gradle:4.2.0'
+		classpath 'com.android.tools.build:gradle:7.2.1'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 	}
 }
diff --git a/scripts/android/files/gradle-wrapper.properties b/scripts/android/files/gradle-wrapper.properties
index ffed3a254..aa991fcea 100644
--- a/scripts/android/files/gradle-wrapper.properties
+++ b/scripts/android/files/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/base/log.cpp b/src/base/log.cpp
index f94332aef..a6668023d 100644
--- a/src/base/log.cpp
+++ b/src/base/log.cpp
@@ -162,7 +162,7 @@ public:
 	void Log(const CLogMessage *pMessage) override
 	{
 		int AndroidLevel;
-		switch(Level)
+		switch(pMessage->m_Level)
 		{
 		case LEVEL_TRACE: AndroidLevel = ANDROID_LOG_VERBOSE; break;
 		case LEVEL_DEBUG: AndroidLevel = ANDROID_LOG_DEBUG; break;