diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-14 19:57:21 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-03-14 19:57:21 +0100 |
| commit | b12f569fc6b78c1e657bc0cfd8518b997d5f83c7 (patch) | |
| tree | d6dc279b1e46752ed95922dedfc813fd9da85506 | |
| parent | 7993a403f2c17a215e4895ba1848aaf69bb61980 (diff) | |
| download | minetest-b12f569fc6b78c1e657bc0cfd8518b997d5f83c7.tar.gz minetest-b12f569fc6b78c1e657bc0cfd8518b997d5f83c7.tar.bz2 minetest-b12f569fc6b78c1e657bc0cfd8518b997d5f83c7.zip | |
Releasing android
| -rw-r--r-- | build/android/AndroidManifest.xml.template | 2 | ||||
| -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) | 2 | ||||
| -rw-r--r-- | build/android/src/net/minetest/minetest/MinetestTextEntry.java (renamed from build/android/src/org/minetest/minetest/MinetestTextEntry.java) | 2 | ||||
| -rw-r--r-- | build/android/src/net/minetest/minetest/MtNativeActivity.java (renamed from build/android/src/org/minetest/minetest/MtNativeActivity.java) | 2 | ||||
| -rw-r--r-- | src/porting_android.cpp | 6 |
6 files changed, 8 insertions, 8 deletions
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 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.minetest.minetest" + package="net.minetest.minetest" android:versionCode="###ANDROID_VERSION###" android:versionName="###BASE_VERSION###.###ANDROID_VERSION###" android:installLocation="auto"> 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 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 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 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" << |