summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorstujones11 <stujones111@gmail.com>2018-12-22 18:02:00 +0000
committerLoïc Blot <nerzhul@users.noreply.github.com>2018-12-22 19:02:00 +0100
commitb8b33a6423ad3d0ac1d701b91099e3a70e4f6197 (patch)
treec2c49ba98c3776d9a5dd567a2c02d97dbccfc602 /build
parent309e158fc818227aa08086a0478ba45d1ee3c769 (diff)
downloadminetest-b8b33a6423ad3d0ac1d701b91099e3a70e4f6197.tar.gz
minetest-b8b33a6423ad3d0ac1d701b91099e3a70e4f6197.tar.bz2
minetest-b8b33a6423ad3d0ac1d701b91099e3a70e4f6197.zip
Android: Fix start-up crashes on version 4.x (#8003)
* Android: Load shared STL library * Android: Fix exception with window background image
Diffstat (limited to 'build')
-rw-r--r--build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java1
-rw-r--r--build/android/src/main/res/values-v21/styles.xml4
-rw-r--r--build/android/src/main/res/values/styles.xml4
3 files changed, 5 insertions, 4 deletions
diff --git a/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java
index f76634c20..bca8f544e 100644
--- a/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java
+++ b/build/android/src/main/java/net.minetest.minetest/MtNativeActivity.java
@@ -10,6 +10,7 @@ import android.view.WindowManager;
public class MtNativeActivity extends NativeActivity {
static {
+ System.loadLibrary("c++_shared");
System.loadLibrary("openal");
System.loadLibrary("ogg");
System.loadLibrary("vorbis");
diff --git a/build/android/src/main/res/values-v21/styles.xml b/build/android/src/main/res/values-v21/styles.xml
index efd09d274..825ab1d37 100644
--- a/build/android/src/main/res/values-v21/styles.xml
+++ b/build/android/src/main/res/values-v21/styles.xml
@@ -4,9 +4,9 @@
<style name="AppTheme" parent="@android:style/android:Theme.Material.Light.NoActionBar.Fullscreen">
<item name="android:windowNoTitle">true</item>
<item name="android:windowAnimationStyle">@null</item>
- <item name="android:background">@drawable/bg</item>
+ <item name="android:windowBackground">@drawable/bg</item>
</style>
<style name="Theme.Dialog" parent="@android:style/Theme.Material.Light.Dialog.NoActionBar"/>
-</resources> \ No newline at end of file
+</resources>
diff --git a/build/android/src/main/res/values/styles.xml b/build/android/src/main/res/values/styles.xml
index 8b52472a5..3e66ff4ba 100644
--- a/build/android/src/main/res/values/styles.xml
+++ b/build/android/src/main/res/values/styles.xml
@@ -4,9 +4,9 @@
<style name="AppTheme" parent="@android:style/android:Theme.Holo.Light.NoActionBar.Fullscreen">
<item name="android:windowNoTitle">true</item>
<item name="android:windowAnimationStyle">@null</item>
- <item name="android:background">@drawable/bg</item>
+ <item name="android:windowBackground">@drawable/bg</item>
</style>
<style name="Theme.Dialog" parent="@android:style/android:Theme.Holo.Light.Dialog.NoActionBar"/>
-</resources> \ No newline at end of file
+</resources>