Android: Fix start-up crashes on version 4.x (#8003)

* Android: Load shared STL library

* Android: Fix exception with window background image

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 234a503dab52e9d165be6be9cae0abb86961b492..8669b44935cbc565d757f7bc76ee4762ef9cd0ee 100644 (file)
--- 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 efd09d27457dfcd117ac4989715cb0433d784d83..825ab1d37c45bc285647ad28219269eaaaf91065 100644 (file)
--- 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 8b52472a589bbf5819b8a7f9b15813e9dcd1269d..3e66ff4ba10aba8432c5e89d6de09cf736c504f5 100644 (file)
--- 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>