Update Android to new dependency repo (#11690)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 660b5c8df3b207aeeeafd14c349515c96c2c268e..cc5fe83ef89d68035006aa96e99510e3ebf60cdb 100644 (file)
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -21,15 +21,13 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
     - name: Install deps
-      run: sudo apt-get update; sudo apt-get install -y --no-install-recommends gettext
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y --no-install-recommends gettext openjdk-11-jdk-headless
     - name: Build with Gradle
       run: cd android; ./gradlew assemblerelease
     - name: Save armeabi artifact

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 53fe8591014425f7b525b79e9485810675677802..234868f92108f279b446ea381e7f5602ae3d7605 100644 (file)
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 android {
        compileSdkVersion 29
        buildToolsVersion '30.0.3'
-       ndkVersion '22.0.7026061'
+       ndkVersion "$ndk_version"
        defaultConfig {
                applicationId 'net.minetest.minetest'
                minSdkVersion 16
@@ -68,7 +68,7 @@ task prepareAssets() {
                from "${projRoot}/client/shaders" into "${assetsFolder}/client/shaders"
        }
        copy {
-               from "../native/deps/Android/Irrlicht/shaders" into "${assetsFolder}/client/shaders/Irrlicht"
+               from "../native/deps/armeabi-v7a/Irrlicht/Shaders" into "${assetsFolder}/client/shaders/Irrlicht"
        }
        copy {
                from "${projRoot}/fonts" include "*.ttf" into "${assetsFolder}/fonts"
@@ -112,5 +112,5 @@ android.applicationVariants.all { variant ->
 
 dependencies {
        implementation project(':native')
-       implementation 'androidx.appcompat:appcompat:1.2.0'
+       implementation 'androidx.appcompat:appcompat:1.3.1'
 }

diff --git a/android/build.gradle b/android/build.gradle
index 3ba51a4bb7558ba319990916b2ad6d96b87df94f..e2fd2b3dbb6b810ffea45837510b0acd75475866 100644 (file)
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -10,12 +10,13 @@ project.ext.set("versionCode", 32)      // Android Version Code
 // each APK must have a larger `versionCode` than the previous
 
 buildscript {
+       ext.ndk_version = '23.0.7599858'
        repositories {
                google()
                jcenter()
        }
        dependencies {
-               classpath 'com.android.tools.build:gradle:4.1.1'
+               classpath 'com.android.tools.build:gradle:7.0.3'
                classpath 'de.undercouch:gradle-download-task:4.1.1'
                // NOTE: Do not place your application dependencies here; they belong
                // in the individual module build.gradle files

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 7fd9307d730679c6fab651833fa3b694d6353ffc..8ad73a75c039a1402b6ac795df1089118f38c4a7 100644 (file)
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jan 08 17:52:00 UTC 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

diff --git a/android/native/build.gradle b/android/native/build.gradle
index a7f09564138b24bc251e7cb9023ef23611f5b138..e37694f5be3d2935d1d3ab389babf3a33d504add 100644 (file)
--- a/android/native/build.gradle
+++ b/android/native/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'de.undercouch.download'
 android {
        compileSdkVersion 29
        buildToolsVersion '30.0.3'
-       ndkVersion '22.0.7026061'
+       ndkVersion "$ndk_version"
        defaultConfig {
                minSdkVersion 16
                targetSdkVersion 29
@@ -50,53 +50,19 @@ android {
 }
 
 // get precompiled deps
-def folder = 'minetest_android_deps_binaries'
-
 task downloadDeps(type: Download) {
-       src 'https://github.com/minetest/' + folder + '/archive/master.zip'
+       src 'https://github.com/minetest/minetest_android_deps/releases/download/latest/deps.zip'
        dest new File(buildDir, 'deps.zip')
        overwrite false
 }
 
 task getDeps(dependsOn: downloadDeps, type: Copy) {
-       def deps = file('deps')
-       def f = file("$buildDir/" + folder + "-master")
-
-       if (!deps.exists() && !f.exists()) {
+       def deps = new File(buildDir.parent, 'deps')
+       if (!deps.exists()) {
+               deps.mkdir()
                from zipTree(downloadDeps.dest)
-               into buildDir
-       }
-
-       doLast {
-               if (!deps.exists()) {
-                       file(f).renameTo(file(deps))
-               }
-       }
-}
-
-// get sqlite
-def sqlite_ver = '3340000'
-task downloadSqlite(dependsOn: getDeps, type: Download) {
-       src 'https://www.sqlite.org/2020/sqlite-amalgamation-' + sqlite_ver + '.zip'
-       dest new File(buildDir, 'sqlite.zip')
-       overwrite false
-}
-
-task getSqlite(dependsOn: downloadSqlite, type: Copy) {
-       def sqlite = file('deps/Android/sqlite')
-       def f = file("$buildDir/sqlite-amalgamation-" + sqlite_ver)
-
-       if (!sqlite.exists() && !f.exists()) {
-               from zipTree(downloadSqlite.dest)
-               into buildDir
-       }
-
-       doLast {
-               if (!sqlite.exists()) {
-                       file(f).renameTo(file(sqlite))
-               }
+               into deps
        }
 }
 
 preBuild.dependsOn getDeps
-preBuild.dependsOn getSqlite

diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index 26e9b058b88014398ed9c7716e2055802b068d28..85c13bfb391de11ef85e0f8083bcb42b4dd47175 100644 (file)
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -4,62 +4,82 @@ LOCAL_PATH := $(call my-dir)/..
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := Curl
-LOCAL_SRC_FILES := deps/Android/Curl/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libcurl.a
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Curl/libcurl.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := Freetype
-LOCAL_SRC_FILES := deps/Android/Freetype/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libfreetype.a
+LOCAL_MODULE := libmbedcrypto
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Curl/libmbedcrypto.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := Irrlicht
-LOCAL_SRC_FILES := deps/Android/Irrlicht/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libIrrlichtMt.a
+LOCAL_MODULE := libmbedtls
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Curl/libmbedtls.a
 include $(PREBUILT_STATIC_LIBRARY)
 
-#include $(CLEAR_VARS)
-#LOCAL_MODULE := LevelDB
-#LOCAL_SRC_FILES := deps/Android/LevelDB/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libleveldb.a
-#include $(PREBUILT_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmbedx509
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Curl/libmbedx509.a
+include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := LuaJIT
-LOCAL_SRC_FILES := deps/Android/LuaJIT/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libluajit.a
+LOCAL_MODULE := Freetype
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Freetype/libfreetype.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := mbedTLS
-LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedtls.a
+LOCAL_MODULE := Iconv
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Iconv/libiconv.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := mbedx509
-LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedx509.a
+LOCAL_MODULE := libcharset
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Iconv/libcharset.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := mbedcrypto
-LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedcrypto.a
+LOCAL_MODULE := Irrlicht
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Irrlicht/libIrrlichtMt.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := LuaJIT
+LOCAL_SRC_FILES := deps/$(APP_ABI)/LuaJIT/libluajit.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := OpenAL
-LOCAL_SRC_FILES := deps/Android/OpenAL-Soft/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libopenal.a
+LOCAL_SRC_FILES := deps/$(APP_ABI)/OpenAL-Soft/libopenal.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := GetText
-LOCAL_SRC_FILES := deps/Android/GetText/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libintl.a
+LOCAL_MODULE := Gettext
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Gettext/libintl.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := SQLite3
+LOCAL_SRC_FILES := deps/$(APP_ABI)/SQLite/libsqlite3.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := Vorbis
-LOCAL_SRC_FILES := deps/Android/Vorbis/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libvorbis.a
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Vorbis/libvorbis.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libvorbisfile
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Vorbis/libvorbisfile.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libogg
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Vorbis/libogg.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := Zstd
-LOCAL_SRC_FILES := deps/Android/Zstd/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libzstd.a
+LOCAL_SRC_FILES := deps/$(APP_ABI)/Zstd/libzstd.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -96,18 +116,16 @@ LOCAL_C_INCLUDES := \
        ../../src/script                             \
        ../../lib/gmp                                \
        ../../lib/jsoncpp                            \
-       deps/Android/Curl/include                       \
-       deps/Android/Freetype/include                   \
-       deps/Android/Irrlicht/include                   \
-       deps/Android/LevelDB/include                    \
-       deps/Android/GetText/include                    \
-       deps/Android/libiconv/include                   \
-       deps/Android/libiconv/libcharset/include        \
-       deps/Android/LuaJIT/src                         \
-       deps/Android/OpenAL-Soft/include                \
-       deps/Android/sqlite                             \
-       deps/Android/Vorbis/include                     \
-       deps/Android/Zstd/include
+       deps/$(APP_ABI)/Curl/include                       \
+       deps/$(APP_ABI)/Freetype/include/freetype2         \
+       deps/$(APP_ABI)/Irrlicht/include                   \
+       deps/$(APP_ABI)/Gettext/include                    \
+       deps/$(APP_ABI)/Iconv/include                      \
+       deps/$(APP_ABI)/LuaJIT/include                     \
+       deps/$(APP_ABI)/OpenAL-Soft/include                \
+       deps/$(APP_ABI)/SQLite/include                     \
+       deps/$(APP_ABI)/Vorbis/include                     \
+       deps/$(APP_ABI)/Zstd/include
 
 LOCAL_SRC_FILES := \
        $(wildcard ../../src/client/*.cpp)           \
@@ -190,24 +208,24 @@ LOCAL_SRC_FILES := \
        ../../src/voxel.cpp                          \
        ../../src/voxelalgorithms.cpp
 
-# LevelDB backend is disabled
-#      ../../src/database/database-leveldb.cpp
-
 # GMP
 LOCAL_SRC_FILES += ../../lib/gmp/mini-gmp.c
 
 # JSONCPP
 LOCAL_SRC_FILES += ../../lib/jsoncpp/jsoncpp.cpp
 
-# iconv
-LOCAL_SRC_FILES += \
-       deps/Android/libiconv/lib/iconv.c               \
-       deps/Android/libiconv/libcharset/lib/localcharset.c
-
-# SQLite3
-LOCAL_SRC_FILES += deps/Android/sqlite/sqlite3.c
-
-LOCAL_STATIC_LIBRARIES += Curl Freetype Irrlicht OpenAL mbedTLS mbedx509 mbedcrypto Vorbis LuaJIT GetText Zstd android_native_app_glue $(PROFILER_LIBS) #LevelDB
+LOCAL_STATIC_LIBRARIES += \
+       Curl libmbedcrypto libmbedtls libmbedx509 \
+       Freetype \
+       Iconv libcharset \
+       Irrlicht \
+       LuaJIT \
+       OpenAL \
+       Gettext \
+       SQLite3 \
+       Vorbis libvorbisfile libogg \
+       Zstd
+LOCAL_STATIC_LIBRARIES += android_native_app_glue $(PROFILER_LIBS)
 
 LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES
 

diff --git a/android/native/jni/Application.mk b/android/native/jni/Application.mk
index 82f0148f0f7fa8fb9923527ee300d9679af2e188..e21bca61c5daf0659a545e7545ab498ddff39814 100644 (file)
--- a/android/native/jni/Application.mk
+++ b/android/native/jni/Application.mk
@@ -5,22 +5,22 @@ NDK_TOOLCHAIN_VERSION := clang
 APP_SHORT_COMMANDS := true
 APP_MODULES := Minetest
 
-APP_CPPFLAGS := -Ofast -fvisibility=hidden -fexceptions -Wno-deprecated-declarations -Wno-extra-tokens
+APP_CPPFLAGS := -O2 -fvisibility=hidden
 
 ifeq ($(APP_ABI),armeabi-v7a)
-APP_CPPFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb
+APP_CPPFLAGS += -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb
 endif
 
-#ifeq ($(APP_ABI),x86)
-#APP_CPPFLAGS += -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32 -funroll-loops
-#endif
+ifeq ($(APP_ABI),x86)
+APP_CPPFLAGS += -mssse3 -mfpmath=sse -funroll-loops
+endif
 
 ifndef NDEBUG
-APP_CPPFLAGS := -g -D_DEBUG -O0 -fno-omit-frame-pointer -fexceptions
+APP_CPPFLAGS := -g -Og -fno-omit-frame-pointer
 endif
 
-APP_CFLAGS   := $(APP_CPPFLAGS) -Wno-parentheses-equality #-Werror=shorten-64-to-32
-APP_CXXFLAGS := $(APP_CPPFLAGS) -frtti -std=gnu++17
+APP_CFLAGS   := $(APP_CPPFLAGS) -Wno-inconsistent-missing-override -Wno-parentheses-equality
+APP_CXXFLAGS := $(APP_CPPFLAGS) -fexceptions -frtti -std=gnu++17
 APP_LDFLAGS  := -Wl,--no-warn-mismatch,--gc-sections,--icf=safe
 
 ifeq ($(APP_ABI),arm64-v8a)