Move build/android directory to root of project (#11283)

53 files changed, 224 insertions, 223 deletions

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 0fcfe2390..47ab64d11 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -8,7 +8,7 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
-      - 'build/android/**'
+      - 'android/**'
       - '.github/workflows/android.yml'
   pull_request:
     paths:
@@ -16,7 +16,7 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
-      - 'build/android/**'
+      - 'android/**'
       - '.github/workflows/android.yml'
 
 jobs:
@@ -29,14 +29,14 @@ jobs:
       with:
         java-version: 1.8
     - name: Build with Gradle
-      run: cd build/android; ./gradlew assemblerelease
+      run: cd android; ./gradlew assemblerelease
     - name: Save armeabi artifact
       uses: actions/upload-artifact@v2
       with:
         name: Minetest-armeabi-v7a.apk
-        path: build/android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk
+        path: android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk
     - name: Save arm64 artifact
       uses: actions/upload-artifact@v2
       with:
         name: Minetest-arm64-v8a.apk
-        path: build/android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk
+        path: android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk
diff --git a/.gitignore b/.gitignore
index d951f2222..9db060aad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@ doc/mkdocs/docs/*.md
 doc/mkdocs/mkdocs.yml
 
 ## Build files
+build/
 CMakeFiles
 Makefile
 cmake_install.cmake
diff --git a/build/android/.gitignore b/android/.gitignore
index e0613f8b3..e0613f8b3 100644
--- a/build/android/.gitignore
+++ b/android/.gitignore
diff --git a/build/android/app/build.gradle b/android/app/build.gradle
index 7f4eba8c4..b7d93ef0f 100644
--- a/build/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -52,7 +52,7 @@ android {
 
 task prepareAssets() {
 	def assetsFolder = "build/assets"
-	def projRoot = "../../.."
+	def projRoot = "../.."
 	def gameToCopy = "minetest_game"
 
 	copy {
diff --git a/build/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index fa93e7069..fa93e7069 100644
--- a/build/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
diff --git a/build/android/app/src/main/java/net/minetest/minetest/CopyZipTask.java b/android/app/src/main/java/net/minetest/minetest/CopyZipTask.java
index 6d4b6ab0f..6d4b6ab0f 100644
--- a/build/android/app/src/main/java/net/minetest/minetest/CopyZipTask.java
+++ b/android/app/src/main/java/net/minetest/minetest/CopyZipTask.java
diff --git a/build/android/app/src/main/java/net/minetest/minetest/CustomEditText.java b/android/app/src/main/java/net/minetest/minetest/CustomEditText.java
index 8d0a503d0..8d0a503d0 100644
--- a/build/android/app/src/main/java/net/minetest/minetest/CustomEditText.java
+++ b/android/app/src/main/java/net/minetest/minetest/CustomEditText.java
diff --git a/build/android/app/src/main/java/net/minetest/minetest/GameActivity.java b/android/app/src/main/java/net/minetest/minetest/GameActivity.java
index bdf764138..bdf764138 100644
--- a/build/android/app/src/main/java/net/minetest/minetest/GameActivity.java
+++ b/android/app/src/main/java/net/minetest/minetest/GameActivity.java
diff --git a/build/android/app/src/main/java/net/minetest/minetest/MainActivity.java b/android/app/src/main/java/net/minetest/minetest/MainActivity.java
index 2aa50d9ad..2aa50d9ad 100644
--- a/build/android/app/src/main/java/net/minetest/minetest/MainActivity.java
+++ b/android/app/src/main/java/net/minetest/minetest/MainActivity.java
diff --git a/build/android/app/src/main/java/net/minetest/minetest/UnzipService.java b/android/app/src/main/java/net/minetest/minetest/UnzipService.java
index b69f7f36e..b69f7f36e 100644
--- a/build/android/app/src/main/java/net/minetest/minetest/UnzipService.java
+++ b/android/app/src/main/java/net/minetest/minetest/UnzipService.java
diff --git a/build/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png
index 43bd6089e..43bd6089e 100644
--- a/build/android/app/src/main/res/drawable/background.png
+++ b/android/app/src/main/res/drawable/background.png
diff --git a/build/android/app/src/main/res/drawable/bg.xml b/android/app/src/main/res/drawable/bg.xml
index 903335ed9..903335ed9 100644
--- a/build/android/app/src/main/res/drawable/bg.xml
+++ b/android/app/src/main/res/drawable/bg.xml
diff --git a/build/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
index e6f461f14..e6f461f14 100644
--- a/build/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
diff --git a/build/android/app/src/main/res/mipmap/ic_launcher.png b/android/app/src/main/res/mipmap/ic_launcher.png
index 88a83782c..88a83782c 100644
--- a/build/android/app/src/main/res/mipmap/ic_launcher.png
+++ b/android/app/src/main/res/mipmap/ic_launcher.png
diff --git a/build/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 85238117f..85238117f 100644
--- a/build/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
diff --git a/build/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 291a4eaf1..291a4eaf1 100644
--- a/build/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
diff --git a/build/android/build.gradle b/android/build.gradle
index 3ba51a4bb..3ba51a4bb 100644
--- a/build/android/build.gradle
+++ b/android/build.gradle
diff --git a/build/android/gradle.properties b/android/gradle.properties
index 53b475cf9..53b475cf9 100644
--- a/build/android/gradle.properties
+++ b/android/gradle.properties
diff --git a/build/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf01..5c2d1cf01 100644
--- a/build/android/gradle/wrapper/gradle-wrapper.jar
+++ b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/build/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 7fd9307d7..7fd9307d7 100644
--- a/build/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/build/android/gradlew b/android/gradlew
index 83f2acfdc..83f2acfdc 100755
--- a/build/android/gradlew
+++ b/android/gradlew
diff --git a/build/android/gradlew.bat b/android/gradlew.bat
index 9618d8d96..9618d8d96 100644
--- a/build/android/gradlew.bat
+++ b/android/gradlew.bat
diff --git a/build/android/icons/aux1_btn.svg b/android/icons/aux1_btn.svg
index e0ee97c0c..e0ee97c0c 100644
--- a/build/android/icons/aux1_btn.svg
+++ b/android/icons/aux1_btn.svg
diff --git a/build/android/icons/camera_btn.svg b/android/icons/camera_btn.svg
index a91a7fcf8..a91a7fcf8 100644
--- a/build/android/icons/camera_btn.svg
+++ b/android/icons/camera_btn.svg
diff --git a/build/android/icons/chat_btn.svg b/android/icons/chat_btn.svg
index 41dc6f8c7..41dc6f8c7 100644
--- a/build/android/icons/chat_btn.svg
+++ b/android/icons/chat_btn.svg
diff --git a/build/android/icons/chat_hide_btn.svg b/android/icons/chat_hide_btn.svg
index 6647b3097..6647b3097 100644
--- a/build/android/icons/chat_hide_btn.svg
+++ b/android/icons/chat_hide_btn.svg
diff --git a/build/android/icons/chat_show_btn.svg b/android/icons/chat_show_btn.svg
index fce9de996..fce9de996 100644
--- a/build/android/icons/chat_show_btn.svg
+++ b/android/icons/chat_show_btn.svg
diff --git a/build/android/icons/checkbox_tick.svg b/android/icons/checkbox_tick.svg
index 6b727bb52..6b727bb52 100644
--- a/build/android/icons/checkbox_tick.svg
+++ b/android/icons/checkbox_tick.svg
diff --git a/build/android/icons/debug_btn.svg b/android/icons/debug_btn.svg
index 2c37f142a..2c37f142a 100644
--- a/build/android/icons/debug_btn.svg
+++ b/android/icons/debug_btn.svg
diff --git a/build/android/icons/down.svg b/android/icons/down.svg
index 190e7e875..190e7e875 100644
--- a/build/android/icons/down.svg
+++ b/android/icons/down.svg
diff --git a/build/android/icons/drop_btn.svg b/android/icons/drop_btn.svg
index 7cb0e8532..7cb0e8532 100644
--- a/build/android/icons/drop_btn.svg
+++ b/android/icons/drop_btn.svg
diff --git a/build/android/icons/fast_btn.svg b/android/icons/fast_btn.svg
index 1436596b7..1436596b7 100644
--- a/build/android/icons/fast_btn.svg
+++ b/android/icons/fast_btn.svg
diff --git a/build/android/icons/fly_btn.svg b/android/icons/fly_btn.svg
index d203842d4..d203842d4 100644
--- a/build/android/icons/fly_btn.svg
+++ b/android/icons/fly_btn.svg
diff --git a/build/android/icons/gear_icon.svg b/android/icons/gear_icon.svg
index b44685ade..b44685ade 100644
--- a/build/android/icons/gear_icon.svg
+++ b/android/icons/gear_icon.svg
diff --git a/build/android/icons/inventory_btn.svg b/android/icons/inventory_btn.svg
index ee3dc3c17..ee3dc3c17 100644
--- a/build/android/icons/inventory_btn.svg
+++ b/android/icons/inventory_btn.svg
diff --git a/build/android/icons/joystick_bg.svg b/android/icons/joystick_bg.svg
index d8836b358..d8836b358 100644
--- a/build/android/icons/joystick_bg.svg
+++ b/android/icons/joystick_bg.svg
diff --git a/build/android/icons/joystick_center.svg b/android/icons/joystick_center.svg
index 17202290a..17202290a 100644
--- a/build/android/icons/joystick_center.svg
+++ b/android/icons/joystick_center.svg
diff --git a/build/android/icons/joystick_off.svg b/android/icons/joystick_off.svg
index 58e1acf22..58e1acf22 100644
--- a/build/android/icons/joystick_off.svg
+++ b/android/icons/joystick_off.svg
diff --git a/build/android/icons/jump_btn.svg b/android/icons/jump_btn.svg
index 882c49ed7..882c49ed7 100644
--- a/build/android/icons/jump_btn.svg
+++ b/android/icons/jump_btn.svg
diff --git a/build/android/icons/minimap_btn.svg b/android/icons/minimap_btn.svg
index deda32717..deda32717 100644
--- a/build/android/icons/minimap_btn.svg
+++ b/android/icons/minimap_btn.svg
diff --git a/build/android/icons/noclip_btn.svg b/android/icons/noclip_btn.svg
index a816edfc7..a816edfc7 100644
--- a/build/android/icons/noclip_btn.svg
+++ b/android/icons/noclip_btn.svg
diff --git a/build/android/icons/rangeview_btn.svg b/android/icons/rangeview_btn.svg
index f9319e0b5..f9319e0b5 100644
--- a/build/android/icons/rangeview_btn.svg
+++ b/android/icons/rangeview_btn.svg
diff --git a/build/android/icons/rare_controls.svg b/android/icons/rare_controls.svg
index c9991ec7a..c9991ec7a 100644
--- a/build/android/icons/rare_controls.svg
+++ b/android/icons/rare_controls.svg
diff --git a/build/android/icons/zoom.svg b/android/icons/zoom.svg
index ea8dec3c5..ea8dec3c5 100644
--- a/build/android/icons/zoom.svg
+++ b/android/icons/zoom.svg
diff --git a/build/android/keystore-minetest.jks b/android/keystore-minetest.jks
index 8fce68bbb..8fce68bbb 100644
--- a/build/android/keystore-minetest.jks
+++ b/android/keystore-minetest.jks
diff --git a/build/android/native/build.gradle b/android/native/build.gradle
index 8ea6347b3..8ea6347b3 100644
--- a/build/android/native/build.gradle
+++ b/android/native/build.gradle
diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
new file mode 100644
index 000000000..5039f325e
--- /dev/null
+++ b/android/native/jni/Android.mk
@@ -0,0 +1,206 @@
+LOCAL_PATH := $(call my-dir)/..
+
+#LOCAL_ADDRESS_SANITIZER:=true
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Curl
+LOCAL_SRC_FILES := deps/Android/Curl/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/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
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Irrlicht
+LOCAL_SRC_FILES := deps/Android/Irrlicht/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libIrrlichtMt.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 := LuaJIT
+LOCAL_SRC_FILES := deps/Android/LuaJIT/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libluajit.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := mbedTLS
+LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedtls.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := mbedx509
+LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedx509.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := mbedcrypto
+LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedcrypto.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
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Vorbis
+LOCAL_SRC_FILES := deps/Android/Vorbis/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libvorbis.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Minetest
+
+LOCAL_CFLAGS += \
+	-DJSONCPP_NO_LOCALE_SUPPORT     \
+	-DHAVE_TOUCHSCREENGUI           \
+	-DENABLE_GLES=1                 \
+	-DUSE_CURL=1                    \
+	-DUSE_SOUND=1                   \
+	-DUSE_FREETYPE=1                \
+	-DUSE_LEVELDB=0                 \
+	-DUSE_LUAJIT=1                  \
+	-DVERSION_MAJOR=${versionMajor} \
+	-DVERSION_MINOR=${versionMinor} \
+	-DVERSION_PATCH=${versionPatch} \
+	-DVERSION_EXTRA=${versionExtra} \
+	$(GPROF_DEF)
+
+ifdef NDEBUG
+	LOCAL_CFLAGS += -DNDEBUG=1
+endif
+
+ifdef GPROF
+	GPROF_DEF := -DGPROF
+	PROFILER_LIBS := android-ndk-profiler
+	LOCAL_CFLAGS += -pg
+endif
+
+LOCAL_C_INCLUDES := \
+	../../src                                    \
+	../../src/script                             \
+	../../lib/gmp                                \
+	../../lib/jsoncpp                            \
+	deps/Android/Curl/include                       \
+	deps/Android/Freetype/include                   \
+	deps/Android/Irrlicht/include                   \
+	deps/Android/LevelDB/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
+
+LOCAL_SRC_FILES := \
+	$(wildcard ../../src/client/*.cpp)           \
+	$(wildcard ../../src/client/*/*.cpp)         \
+	$(wildcard ../../src/content/*.cpp)          \
+	../../src/database/database.cpp              \
+	../../src/database/database-dummy.cpp        \
+	../../src/database/database-files.cpp        \
+	../../src/database/database-sqlite3.cpp      \
+	$(wildcard ../../src/gui/*.cpp)              \
+	$(wildcard ../../src/irrlicht_changes/*.cpp) \
+	$(wildcard ../../src/mapgen/*.cpp)           \
+	$(wildcard ../../src/network/*.cpp)          \
+	$(wildcard ../../src/script/*.cpp)           \
+	$(wildcard ../../src/script/*/*.cpp)         \
+	$(wildcard ../../src/server/*.cpp)           \
+	$(wildcard ../../src/threading/*.cpp)        \
+	$(wildcard ../../src/util/*.c)               \
+	$(wildcard ../../src/util/*.cpp)             \
+	../../src/ban.cpp                            \
+	../../src/chat.cpp                           \
+	../../src/clientiface.cpp                    \
+	../../src/collision.cpp                      \
+	../../src/content_mapnode.cpp                \
+	../../src/content_nodemeta.cpp               \
+	../../src/convert_json.cpp                   \
+	../../src/craftdef.cpp                       \
+	../../src/debug.cpp                          \
+	../../src/defaultsettings.cpp                \
+	../../src/emerge.cpp                         \
+	../../src/environment.cpp                    \
+	../../src/face_position_cache.cpp            \
+	../../src/filesys.cpp                        \
+	../../src/gettext.cpp                        \
+	../../src/httpfetch.cpp                      \
+	../../src/hud.cpp                            \
+	../../src/inventory.cpp                      \
+	../../src/inventorymanager.cpp               \
+	../../src/itemdef.cpp                        \
+	../../src/itemstackmetadata.cpp              \
+	../../src/light.cpp                          \
+	../../src/log.cpp                            \
+	../../src/main.cpp                           \
+	../../src/map.cpp                            \
+	../../src/map_settings_manager.cpp           \
+	../../src/mapblock.cpp                       \
+	../../src/mapnode.cpp                        \
+	../../src/mapsector.cpp                      \
+	../../src/metadata.cpp                       \
+	../../src/modchannels.cpp                    \
+	../../src/nameidmapping.cpp                  \
+	../../src/nodedef.cpp                        \
+	../../src/nodemetadata.cpp                   \
+	../../src/nodetimer.cpp                      \
+	../../src/noise.cpp                          \
+	../../src/objdef.cpp                         \
+	../../src/object_properties.cpp              \
+	../../src/particles.cpp                      \
+	../../src/pathfinder.cpp                     \
+	../../src/player.cpp                         \
+	../../src/porting.cpp                        \
+	../../src/porting_android.cpp                \
+	../../src/profiler.cpp                       \
+	../../src/raycast.cpp                        \
+	../../src/reflowscan.cpp                     \
+	../../src/remoteplayer.cpp                   \
+	../../src/rollback.cpp                       \
+	../../src/rollback_interface.cpp             \
+	../../src/serialization.cpp                  \
+	../../src/server.cpp                         \
+	../../src/serverenvironment.cpp              \
+	../../src/serverlist.cpp                     \
+	../../src/settings.cpp                       \
+	../../src/staticobject.cpp                   \
+	../../src/texture_override.cpp               \
+	../../src/tileanimation.cpp                  \
+	../../src/tool.cpp                           \
+	../../src/translation.cpp                    \
+	../../src/version.cpp                        \
+	../../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 android_native_app_glue $(PROFILER_LIBS) #LevelDB
+
+LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES
+
+include $(BUILD_SHARED_LIBRARY)
+
+ifdef GPROF
+$(call import-module,android-ndk-profiler)
+endif
+$(call import-module,android/native_app_glue)
diff --git a/build/android/native/jni/Application.mk b/android/native/jni/Application.mk
index 82f0148f0..82f0148f0 100644
--- a/build/android/native/jni/Application.mk
+++ b/android/native/jni/Application.mk
diff --git a/build/android/native/src/main/AndroidManifest.xml b/android/native/src/main/AndroidManifest.xml
index 19451c7fd..19451c7fd 100644
--- a/build/android/native/src/main/AndroidManifest.xml
+++ b/android/native/src/main/AndroidManifest.xml
diff --git a/build/android/settings.gradle b/android/settings.gradle
index b048fca7c..b048fca7c 100644
--- a/build/android/settings.gradle
+++ b/android/settings.gradle
diff --git a/build/android/native/jni/Android.mk b/build/android/native/jni/Android.mk
deleted file mode 100644
index 477392af0..000000000
--- a/build/android/native/jni/Android.mk
+++ /dev/null
@@ -1,206 +0,0 @@
-LOCAL_PATH := $(call my-dir)/..
-
-#LOCAL_ADDRESS_SANITIZER:=true
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := Curl
-LOCAL_SRC_FILES := deps/Android/Curl/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/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
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := Irrlicht
-LOCAL_SRC_FILES := deps/Android/Irrlicht/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libIrrlichtMt.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 := LuaJIT
-LOCAL_SRC_FILES := deps/Android/LuaJIT/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libluajit.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := mbedTLS
-LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedtls.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := mbedx509
-LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedx509.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := mbedcrypto
-LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedcrypto.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
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := Vorbis
-LOCAL_SRC_FILES := deps/Android/Vorbis/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libvorbis.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := Minetest
-
-LOCAL_CFLAGS += \
-	-DJSONCPP_NO_LOCALE_SUPPORT     \
-	-DHAVE_TOUCHSCREENGUI           \
-	-DENABLE_GLES=1                 \
-	-DUSE_CURL=1                    \
-	-DUSE_SOUND=1                   \
-	-DUSE_FREETYPE=1                \
-	-DUSE_LEVELDB=0                 \
-	-DUSE_LUAJIT=1                  \
-	-DVERSION_MAJOR=${versionMajor} \
-	-DVERSION_MINOR=${versionMinor} \
-	-DVERSION_PATCH=${versionPatch} \
-	-DVERSION_EXTRA=${versionExtra} \
-	$(GPROF_DEF)
-
-ifdef NDEBUG
-	LOCAL_CFLAGS += -DNDEBUG=1
-endif
-
-ifdef GPROF
-	GPROF_DEF := -DGPROF
-	PROFILER_LIBS := android-ndk-profiler
-	LOCAL_CFLAGS += -pg
-endif
-
-LOCAL_C_INCLUDES := \
-	../../../src                                    \
-	../../../src/script                             \
-	../../../lib/gmp                                \
-	../../../lib/jsoncpp                            \
-	deps/Android/Curl/include                       \
-	deps/Android/Freetype/include                   \
-	deps/Android/Irrlicht/include                   \
-	deps/Android/LevelDB/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
-
-LOCAL_SRC_FILES := \
-	$(wildcard ../../../src/client/*.cpp)           \
-	$(wildcard ../../../src/client/*/*.cpp)         \
-	$(wildcard ../../../src/content/*.cpp)          \
-	../../../src/database/database.cpp              \
-	../../../src/database/database-dummy.cpp        \
-	../../../src/database/database-files.cpp        \
-	../../../src/database/database-sqlite3.cpp      \
-	$(wildcard ../../../src/gui/*.cpp)              \
-	$(wildcard ../../../src/irrlicht_changes/*.cpp) \
-	$(wildcard ../../../src/mapgen/*.cpp)           \
-	$(wildcard ../../../src/network/*.cpp)          \
-	$(wildcard ../../../src/script/*.cpp)           \
-	$(wildcard ../../../src/script/*/*.cpp)         \
-	$(wildcard ../../../src/server/*.cpp)           \
-	$(wildcard ../../../src/threading/*.cpp)        \
-	$(wildcard ../../../src/util/*.c)               \
-	$(wildcard ../../../src/util/*.cpp)             \
-	../../../src/ban.cpp                            \
-	../../../src/chat.cpp                           \
-	../../../src/clientiface.cpp                    \
-	../../../src/collision.cpp                      \
-	../../../src/content_mapnode.cpp                \
-	../../../src/content_nodemeta.cpp               \
-	../../../src/convert_json.cpp                   \
-	../../../src/craftdef.cpp                       \
-	../../../src/debug.cpp                          \
-	../../../src/defaultsettings.cpp                \
-	../../../src/emerge.cpp                         \
-	../../../src/environment.cpp                    \
-	../../../src/face_position_cache.cpp            \
-	../../../src/filesys.cpp                        \
-	../../../src/gettext.cpp                        \
-	../../../src/httpfetch.cpp                      \
-	../../../src/hud.cpp                            \
-	../../../src/inventory.cpp                      \
-	../../../src/inventorymanager.cpp               \
-	../../../src/itemdef.cpp                        \
-	../../../src/itemstackmetadata.cpp              \
-	../../../src/light.cpp                          \
-	../../../src/log.cpp                            \
-	../../../src/main.cpp                           \
-	../../../src/map.cpp                            \
-	../../../src/map_settings_manager.cpp           \
-	../../../src/mapblock.cpp                       \
-	../../../src/mapnode.cpp                        \
-	../../../src/mapsector.cpp                      \
-	../../../src/metadata.cpp                       \
-	../../../src/modchannels.cpp                    \
-	../../../src/nameidmapping.cpp                  \
-	../../../src/nodedef.cpp                        \
-	../../../src/nodemetadata.cpp                   \
-	../../../src/nodetimer.cpp                      \
-	../../../src/noise.cpp                          \
-	../../../src/objdef.cpp                         \
-	../../../src/object_properties.cpp              \
-	../../../src/particles.cpp                      \
-	../../../src/pathfinder.cpp                     \
-	../../../src/player.cpp                         \
-	../../../src/porting.cpp                        \
-	../../../src/porting_android.cpp                \
-	../../../src/profiler.cpp                       \
-	../../../src/raycast.cpp                        \
-	../../../src/reflowscan.cpp                     \
-	../../../src/remoteplayer.cpp                   \
-	../../../src/rollback.cpp                       \
-	../../../src/rollback_interface.cpp             \
-	../../../src/serialization.cpp                  \
-	../../../src/server.cpp                         \
-	../../../src/serverenvironment.cpp              \
-	../../../src/serverlist.cpp                     \
-	../../../src/settings.cpp                       \
-	../../../src/staticobject.cpp                   \
-	../../../src/texture_override.cpp               \
-	../../../src/tileanimation.cpp                  \
-	../../../src/tool.cpp                           \
-	../../../src/translation.cpp                    \
-	../../../src/version.cpp                        \
-	../../../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 android_native_app_glue $(PROFILER_LIBS) #LevelDB
-
-LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES
-
-include $(BUILD_SHARED_LIBRARY)
-
-ifdef GPROF
-$(call import-module,android-ndk-profiler)
-endif
-$(call import-module,android/native_app_glue)
diff --git a/doc/README.android b/doc/README.android
index f6b67978f..3833688b1 100644
--- a/doc/README.android
+++ b/doc/README.android
@@ -74,7 +74,7 @@ automatically. Or you can create a `local.properties` file and specify
   are different tutorials on the web explaining how to do it
   - choose one yourself.
 
-* Once your keystore is setup, enter build/android subdirectory and create a new
+* Once your keystore is setup, enter the android subdirectory and create a new
   file "ant.properties" there. Add following lines to that file:
 
   > key.store=<path to your keystore>
diff --git a/util/bump_version.sh b/util/bump_version.sh
index 4b12935bd..3e64bfd86 100755
--- a/util/bump_version.sh
+++ b/util/bump_version.sh
@@ -25,13 +25,13 @@ perform_release() {
 
 	sed -i -re "s/^set\(DEVELOPMENT_BUILD TRUE\)$/set(DEVELOPMENT_BUILD FALSE)/" CMakeLists.txt
 
-	sed -i 's/project.ext.set("versionExtra", "-dev")/project.ext.set("versionExtra", "")/' build/android/build.gradle
-	sed -i -re "s/\"versionCode\", [0-9]+/\"versionCode\", $NEW_ANDROID_VERSION_CODE/" build/android/build.gradle
+	sed -i 's/project.ext.set("versionExtra", "-dev")/project.ext.set("versionExtra", "")/' android/build.gradle
+	sed -i -re "s/\"versionCode\", [0-9]+/\"versionCode\", $NEW_ANDROID_VERSION_CODE/" android/build.gradle
 
 	sed -i '/\<release/s/\(version\)="[^"]*"/\1="'"$RELEASE_VERSION"'"/' misc/net.minetest.minetest.appdata.xml
 	sed -i 's/\(<release date\)="[^"]*"/\1="'"$RELEASE_DATE"'"/' misc/net.minetest.minetest.appdata.xml
 
-	git add -f CMakeLists.txt build/android/build.gradle misc/net.minetest.minetest.appdata.xml
+	git add -f CMakeLists.txt android/build.gradle misc/net.minetest.minetest.appdata.xml
 
 	git commit -m "Bump version to $RELEASE_VERSION"
 
@@ -54,17 +54,17 @@ back_to_devel() {
 	sed -i -re "s/^set\(VERSION_PATCH [0-9]+\)$/set(VERSION_PATCH $NEXT_VERSION_PATCH)/" CMakeLists.txt
 
 	# Update Android versions
-	sed -i 's/set("versionExtra", "")/set("versionExtra", "-dev")/' build/android/build.gradle
-	sed -i -re "s/set\(\"versionMajor\", [0-9]+\)/set(\"versionMajor\", $NEXT_VERSION_MAJOR)/" build/android/build.gradle
-	sed -i -re "s/set\(\"versionMinor\", [0-9]+\)/set(\"versionMinor\", $NEXT_VERSION_MINOR)/" build/android/build.gradle
-	sed -i -re "s/set\(\"versionPatch\", [0-9]+\)/set(\"versionPatch\", $NEXT_VERSION_PATCH)/" build/android/build.gradle
+	sed -i 's/set("versionExtra", "")/set("versionExtra", "-dev")/' android/build.gradle
+	sed -i -re "s/set\(\"versionMajor\", [0-9]+\)/set(\"versionMajor\", $NEXT_VERSION_MAJOR)/" android/build.gradle
+	sed -i -re "s/set\(\"versionMinor\", [0-9]+\)/set(\"versionMinor\", $NEXT_VERSION_MINOR)/" android/build.gradle
+	sed -i -re "s/set\(\"versionPatch\", [0-9]+\)/set(\"versionPatch\", $NEXT_VERSION_PATCH)/" android/build.gradle
 
 	# Update doc versions
 	sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEXT_VERSION/g" doc/menu_lua_api.txt
 	sed -i -re "1s/[0-9]+\.[0-9]+\.[0-9]+/$NEXT_VERSION/g" doc/client_lua_api.txt
 
 	# Commit
-	git add -f CMakeLists.txt build/android/build.gradle doc/menu_lua_api.txt doc/client_lua_api.txt
+	git add -f CMakeLists.txt android/build.gradle doc/menu_lua_api.txt doc/client_lua_api.txt
 	git commit -m "Continue with $NEXT_VERSION-dev"
 }
 ##################################
@@ -82,12 +82,12 @@ cd ${0%/*}/..
 grep -q -E '^set\(VERSION_MAJOR [0-9]+\)$' CMakeLists.txt
 grep -q -E '^set\(VERSION_MINOR [0-9]+\)$' CMakeLists.txt
 grep -q -E '^set\(VERSION_PATCH [0-9]+\)$' CMakeLists.txt
-grep -q -E '\("versionCode", [0-9]+\)' build/android/build.gradle
+grep -q -E '\("versionCode", [0-9]+\)' android/build.gradle
 
 VERSION_MAJOR=$(grep -E '^set\(VERSION_MAJOR [0-9]+\)$' CMakeLists.txt | tr -dC 0-9)
 VERSION_MINOR=$(grep -E '^set\(VERSION_MINOR [0-9]+\)$' CMakeLists.txt | tr -dC 0-9)
 VERSION_PATCH=$(grep -E '^set\(VERSION_PATCH [0-9]+\)$' CMakeLists.txt | tr -dC 0-9)
-ANDROID_VERSION_CODE=$(grep -E '"versionCode", [0-9]+' build/android/build.gradle | tr -dC 0-9)
+ANDROID_VERSION_CODE=$(grep -E '"versionCode", [0-9]+' android/build.gradle | tr -dC 0-9)
 
 RELEASE_VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"