diff options
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/build.gradle | 7 | ||||
| -rw-r--r-- | build/android/gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rw-r--r-- | build/android/jni/Android.mk | 6 | ||||
| -rw-r--r-- | build/android/keystore-minetest.jks | bin | 0 -> 2247 bytes | |||
| -rw-r--r-- | build/android/src/main/java/net.minetest.minetest/MinetestAssetCopy.java | 10 |
5 files changed, 19 insertions, 8 deletions
diff --git a/build/android/build.gradle b/build/android/build.gradle index 11a4a714c..81c99c974 100644 --- a/build/android/build.gradle +++ b/build/android/build.gradle @@ -1,16 +1,16 @@ buildscript { repositories { - maven { url 'https://maven.google.com' } + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.4.2' } } allprojects { repositories { - maven { url 'https://maven.google.com' } + google() jcenter() } } @@ -25,7 +25,6 @@ apply plugin: "com.android.application" android { compileSdkVersion 28 - buildToolsVersion "28.0.3" defaultConfig { versionCode 24 diff --git a/build/android/gradle/wrapper/gradle-wrapper.properties b/build/android/gradle/wrapper/gradle-wrapper.properties index d7d50b600..7ba375433 100644 --- a/build/android/gradle/wrapper/gradle-wrapper.properties +++ b/build/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Oct 15 00:47:03 CEST 2018 +#Fri Aug 09 22:14:33 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index a8e017510..22e1f8a08 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -65,6 +65,7 @@ endif LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ \ -DHAVE_TOUCHSCREENGUI \ + -DENABLE_GLES=1 \ -DUSE_CURL=1 \ -DUSE_SOUND=1 \ -DUSE_FREETYPE=1 \ @@ -177,6 +178,7 @@ LOCAL_SRC_FILES := \ jni/src/filesys.cpp \ jni/src/genericobject.cpp \ jni/src/gettext.cpp \ + jni/src/gui/guiButton.cpp \ jni/src/gui/guiChatConsole.cpp \ jni/src/gui/guiConfirmRegistration.cpp \ jni/src/gui/guiEditBoxWithScrollbar.cpp \ @@ -185,6 +187,8 @@ LOCAL_SRC_FILES := \ jni/src/gui/guiKeyChangeMenu.cpp \ jni/src/gui/guiPasswordChange.cpp \ jni/src/gui/guiPathSelectMenu.cpp \ + jni/src/gui/guiScrollBar.cpp \ + jni/src/gui/guiSkin.cpp \ jni/src/gui/guiTable.cpp \ jni/src/gui/guiVolumeChange.cpp \ jni/src/gui/intlGUIEditBox.cpp \ @@ -237,7 +241,6 @@ LOCAL_SRC_FILES := \ jni/src/porting_android.cpp \ jni/src/porting.cpp \ jni/src/profiler.cpp \ - jni/src/quicktune.cpp \ jni/src/raycast.cpp \ jni/src/reflowscan.cpp \ jni/src/remoteplayer.cpp \ @@ -286,6 +289,7 @@ LOCAL_SRC_FILES := \ jni/src/util/ieee_float.cpp \ jni/src/util/numeric.cpp \ jni/src/util/pointedthing.cpp \ + jni/src/util/quicktune.cpp \ jni/src/util/serialize.cpp \ jni/src/util/sha1.cpp \ jni/src/util/srp.cpp \ diff --git a/build/android/keystore-minetest.jks b/build/android/keystore-minetest.jks Binary files differnew file mode 100644 index 000000000..8fce68bbb --- /dev/null +++ b/build/android/keystore-minetest.jks diff --git a/build/android/src/main/java/net.minetest.minetest/MinetestAssetCopy.java b/build/android/src/main/java/net.minetest.minetest/MinetestAssetCopy.java index b570fe61a..03b34f705 100644 --- a/build/android/src/main/java/net.minetest.minetest/MinetestAssetCopy.java +++ b/build/android/src/main/java/net.minetest.minetest/MinetestAssetCopy.java @@ -53,6 +53,14 @@ public class MinetestAssetCopy extends Activity { super.onResume(); makeFullScreen(); } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (m_AssetCopy != null) { + m_AssetCopy.cancel(true); + } + } public void makeFullScreen() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { @@ -77,7 +85,7 @@ public class MinetestAssetCopy extends Activity { return this; } - private class copyAssetTask extends AsyncTask<String, Integer, String> { + private static class copyAssetTask extends AsyncTask<String, Integer, String> { boolean m_copy_started = false; String m_Foldername = "media"; Vector<String> m_foldernames; |