From 155116852a6775521e20086be4e8a50b41fc07db Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sat, 14 Mar 2015 19:59:14 +0100 Subject: [PATCH] Android: Backport changes from stable-0.4 --- build/android/Makefile | 2 +- .../{org => net}/minetest/minetest/MinetestAssetCopy.java | 0 .../{org => net}/minetest/minetest/MinetestTextEntry.java | 0 .../{org => net}/minetest/minetest/MtNativeActivity.java | 0 src/porting_android.cpp | 6 +++--- 5 files changed, 4 insertions(+), 4 deletions(-) rename build/android/src/{org => net}/minetest/minetest/MinetestAssetCopy.java (100%) rename build/android/src/{org => net}/minetest/minetest/MinetestTextEntry.java (100%) rename build/android/src/{org => net}/minetest/minetest/MtNativeActivity.java (100%) 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 similarity index 100% rename from build/android/src/org/minetest/minetest/MinetestAssetCopy.java rename to 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 similarity index 100% rename from build/android/src/org/minetest/minetest/MinetestTextEntry.java rename to 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 similarity index 100% rename from build/android/src/org/minetest/minetest/MtNativeActivity.java rename to 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" << -- 2.25.1