aboutsummaryrefslogtreecommitdiff
path: root/android/app
diff options
context:
space:
mode:
authorparadust7 <102263465+paradust7@users.noreply.github.com>2022-05-21 08:48:40 -0700
committersfan5 <sfan5@live.de>2022-05-21 17:49:41 +0200
commit371f21fb350a29ad1ade4ffaf38c07ca1742cd63 (patch)
tree9a0659c9ae5bf3680cdea9b4bf4d89717c777cd2 /android/app
parent8edc0fae5f0789e45a0dd1393a37c9993c694c82 (diff)
downloadminetest-371f21fb350a29ad1ade4ffaf38c07ca1742cd63.tar.gz
minetest-371f21fb350a29ad1ade4ffaf38c07ca1742cd63.tar.bz2
minetest-371f21fb350a29ad1ade4ffaf38c07ca1742cd63.zip
Fixes to Android build + option to turn LuaJIT on/off for testing purposes (#12334)
Diffstat (limited to 'android/app')
-rw-r--r--android/app/src/main/java/net/minetest/minetest/GameActivity.java4
1 files changed, 4 insertions, 0 deletions
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");