summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorSmallJoker <SmallJoker@users.noreply.github.com>2022-08-02 21:34:17 +0200
committerGitHub <noreply@github.com>2022-08-02 21:34:17 +0200
commita81259d19a434752614e5a430fdebf86f07c1cfc (patch)
treefcb83c0aa14c645c0050d683b54131bc598556f3 /android
parentf22d40975e907d9f0e84b67b21256953333a6cc8 (diff)
downloadminetest-a81259d19a434752614e5a430fdebf86f07c1cfc.tar.gz
minetest-a81259d19a434752614e5a430fdebf86f07c1cfc.tar.bz2
minetest-a81259d19a434752614e5a430fdebf86f07c1cfc.zip
Run Minetest update checker on startup (#7629)
This feature is enabled by default for non-Android release builds. Package maintainers may use -DENABLE_UPDATE_CHECKER=0 to disable it. Co-authored-by: rubenwardy <rw@rubenwardy.com> Co-authored-by: sfan5 <sfan5@live.de>
Diffstat (limited to 'android')
-rw-r--r--android/build.gradle1
-rw-r--r--android/native/build.gradle3
-rw-r--r--android/native/jni/Android.mk1
3 files changed, 4 insertions, 1 deletions
diff --git a/android/build.gradle b/android/build.gradle
index 027223601..8ba61c4a0 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,6 +5,7 @@ project.ext.set("versionMinor", 6) // Version Minor
project.ext.set("versionPatch", 0) // Version Patch
project.ext.set("versionExtra", "-dev") // Version Extra
project.ext.set("versionCode", 38) // Android Version Code
+project.ext.set("developmentBuild", 1) // Whether it is a development build, or a release
// NOTE: +2 after each release!
// +1 for ARM and +1 for ARM64 APK's, because
// each APK must have a larger `versionCode` than the previous
diff --git a/android/native/build.gradle b/android/native/build.gradle
index 2ddc77135..2254aab3a 100644
--- a/android/native/build.gradle
+++ b/android/native/build.gradle
@@ -14,7 +14,8 @@ android {
"versionMajor=${versionMajor}",
"versionMinor=${versionMinor}",
"versionPatch=${versionPatch}",
- "versionExtra=${versionExtra}"
+ "versionExtra=${versionExtra}",
+ "developmentBuild=${developmentBuild}"
}
}
}
diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index b522042de..50651d5ba 100644
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -102,6 +102,7 @@ LOCAL_CFLAGS += \
-DVERSION_MINOR=${versionMinor} \
-DVERSION_PATCH=${versionPatch} \
-DVERSION_EXTRA=${versionExtra} \
+ -DDEVELOPMENT_BUILD=${developmentBuild} \
$(GPROF_DEF)
ifdef USE_BUILTIN_LUA