From 371f21fb350a29ad1ade4ffaf38c07ca1742cd63 Mon Sep 17 00:00:00 2001
From: paradust7 <102263465+paradust7@users.noreply.github.com>
Date: Sat, 21 May 2022 08:48:40 -0700
Subject: Fixes to Android build + option to turn LuaJIT on/off for testing
 purposes (#12334)

---
 android/app/src/main/java/net/minetest/minetest/GameActivity.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'android/app/src/main/java')

diff --git a/android/app/src/main/java/net/minetest/minetest/GameActivity.java b/android/app/src/main/java/net/minetest/minetest/GameActivity.java
index 46fc9b1de..eeb90ea7f 100644
--- a/android/app/src/main/java/net/minetest/minetest/GameActivity.java
+++ b/android/app/src/main/java/net/minetest/minetest/GameActivity.java
@@ -34,10 +34,14 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 
+import androidx.annotation.Keep;
 import androidx.appcompat.app.AlertDialog;
 
 import java.util.Objects;
 
+// Native code finds these methods by name (see porting_android.cpp).
+// This annotation prevents the minifier/Proguard from mangling them.
+@Keep
 public class GameActivity extends NativeActivity {
 	static {
 		System.loadLibrary("c++_shared");
-- 
cgit v1.2.3