From b12f569fc6b78c1e657bc0cfd8518b997d5f83c7 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sat, 14 Mar 2015 19:57:21 +0100 Subject: [PATCH] Releasing android --- build/android/AndroidManifest.xml.template | 2 +- build/android/Makefile | 2 +- .../{org => net}/minetest/minetest/MinetestAssetCopy.java | 2 +- .../{org => net}/minetest/minetest/MinetestTextEntry.java | 2 +- .../{org => net}/minetest/minetest/MtNativeActivity.java | 2 +- src/porting_android.cpp | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) rename build/android/src/{org => net}/minetest/minetest/MinetestAssetCopy.java (99%) rename build/android/src/{org => net}/minetest/minetest/MinetestTextEntry.java (98%) rename build/android/src/{org => net}/minetest/minetest/MtNativeActivity.java (98%) diff --git a/build/android/AndroidManifest.xml.template b/build/android/AndroidManifest.xml.template index a0ca7993c..0f75ca648 100644 --- a/build/android/AndroidManifest.xml.template +++ b/build/android/AndroidManifest.xml.template @@ -1,6 +1,6 @@ diff --git a/build/android/Makefile b/build/android/Makefile index 6027982ed..ef9376df3 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 = 6 +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 99% rename from build/android/src/org/minetest/minetest/MinetestAssetCopy.java rename to build/android/src/net/minetest/minetest/MinetestAssetCopy.java index 45dc6373a..5776e77b5 100644 --- a/build/android/src/org/minetest/minetest/MinetestAssetCopy.java +++ b/build/android/src/net/minetest/minetest/MinetestAssetCopy.java @@ -1,4 +1,4 @@ -package org.minetest.minetest; +package net.minetest.minetest; import java.io.BufferedReader; import java.io.File; diff --git a/build/android/src/org/minetest/minetest/MinetestTextEntry.java b/build/android/src/net/minetest/minetest/MinetestTextEntry.java similarity index 98% rename from build/android/src/org/minetest/minetest/MinetestTextEntry.java rename to build/android/src/net/minetest/minetest/MinetestTextEntry.java index db175a483..68dc73274 100644 --- a/build/android/src/org/minetest/minetest/MinetestTextEntry.java +++ b/build/android/src/net/minetest/minetest/MinetestTextEntry.java @@ -1,4 +1,4 @@ -package org.minetest.minetest; +package net.minetest.minetest; import android.app.Activity; import android.app.AlertDialog; diff --git a/build/android/src/org/minetest/minetest/MtNativeActivity.java b/build/android/src/net/minetest/minetest/MtNativeActivity.java similarity index 98% rename from build/android/src/org/minetest/minetest/MtNativeActivity.java rename to build/android/src/net/minetest/minetest/MtNativeActivity.java index ba7d62169..2bfcef93c 100644 --- a/build/android/src/org/minetest/minetest/MtNativeActivity.java +++ b/build/android/src/net/minetest/minetest/MtNativeActivity.java @@ -1,4 +1,4 @@ -package org.minetest.minetest; +package net.minetest.minetest; import android.app.NativeActivity; import android.content.Intent; 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