diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-14 19:59:14 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-14 19:59:14 +0100 |
| commit | 155116852a6775521e20086be4e8a50b41fc07db (patch) | |
| tree | 666b870b06abf1251d130d87a0502263017d6dee | |
| parent | aa085bf222888d64c9ccb4551d8b129be3cf7549 (diff) | |
| download | minetest-155116852a6775521e20086be4e8a50b41fc07db.tar.gz minetest-155116852a6775521e20086be4e8a50b41fc07db.tar.bz2 minetest-155116852a6775521e20086be4e8a50b41fc07db.zip | |
Android: Backport changes from stable-0.4
| -rw-r--r-- | build/android/Makefile | 2 | ||||
| -rw-r--r-- | build/android/src/net/minetest/minetest/MinetestAssetCopy.java (renamed from build/android/src/org/minetest/minetest/MinetestAssetCopy.java) | 0 | ||||
| -rw-r--r-- | build/android/src/net/minetest/minetest/MinetestTextEntry.java (renamed from build/android/src/org/minetest/minetest/MinetestTextEntry.java) | 0 | ||||
| -rw-r--r-- | build/android/src/net/minetest/minetest/MtNativeActivity.java (renamed from build/android/src/org/minetest/minetest/MtNativeActivity.java) | 0 | ||||
| -rw-r--r-- | src/porting_android.cpp | 6 |
5 files changed, 4 insertions, 4 deletions
diff --git a/build/android/Makefile b/build/android/Makefile index 4c371afea..785ba3e7e 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -26,7 +26,7 @@ GAMES_TO_COPY = minetest_game # Android Version code # Increase for each build! ################################################################################ -ANDROID_VERSION_CODE = 7 +ANDROID_VERSION_CODE = 10 ################################################################################ # toolchain config for arm old processors diff --git a/build/android/src/org/minetest/minetest/MinetestAssetCopy.java b/build/android/src/net/minetest/minetest/MinetestAssetCopy.java index 5776e77b5..5776e77b5 100644 --- a/build/android/src/org/minetest/minetest/MinetestAssetCopy.java +++ b/build/android/src/net/minetest/minetest/MinetestAssetCopy.java diff --git a/build/android/src/org/minetest/minetest/MinetestTextEntry.java b/build/android/src/net/minetest/minetest/MinetestTextEntry.java index 68dc73274..68dc73274 100644 --- a/build/android/src/org/minetest/minetest/MinetestTextEntry.java +++ b/build/android/src/net/minetest/minetest/MinetestTextEntry.java diff --git a/build/android/src/org/minetest/minetest/MtNativeActivity.java b/build/android/src/net/minetest/minetest/MtNativeActivity.java index 2bfcef93c..2bfcef93c 100644 --- a/build/android/src/org/minetest/minetest/MtNativeActivity.java +++ b/build/android/src/net/minetest/minetest/MtNativeActivity.java diff --git a/src/porting_android.cpp b/src/porting_android.cpp index 96c9385a6..6871ce465 100644 --- a/src/porting_android.cpp +++ b/src/porting_android.cpp @@ -71,10 +71,10 @@ void android_main(android_app *app) /* TODO this doesn't work as expected, no idea why but there's a workaround */ /* for it right now */ extern "C" { - JNIEXPORT void JNICALL Java_org_minetest_MtNativeActivity_putMessageBoxResult( + JNIEXPORT void JNICALL Java_net_minetest_MtNativeActivity_putMessageBoxResult( JNIEnv * env, jclass thiz, jstring text) { - errorstream << "Java_org_minetest_MtNativeActivity_putMessageBoxResult got: " + errorstream << "Java_net_minetest_MtNativeActivity_putMessageBoxResult got: " << std::string((const char*)env->GetStringChars(text,0)) << std::endl; } @@ -138,7 +138,7 @@ void initAndroid() exit(-1); } - nativeActivity = findClass("org/minetest/minetest/MtNativeActivity"); + nativeActivity = findClass("net/minetest/minetest/MtNativeActivity"); if (nativeActivity == 0) { errorstream << "porting::initAndroid unable to find java native activity class" << |