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

* Android: Load shared STL library * Android: Fix exception with window background image
minetest · Dec 22, 2018 · b8b33a6423ad3d0ac1d701b91099e3a70e4f6197 · b8b33a6
1 parent 309e158
commit b8b33a6423ad3d0ac1d701b91099e3a70e4f6197
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 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
@@ -10,6 +10,7 @@
 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
@@ -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>
+</resources>
diff --git 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>
+</resources>