Skip to content
Permalink
Browse files
Move build/android directory to root of project (#11283)
  • Loading branch information
NeroBurner committed Jun 21, 2021
1 parent 7fdbf3f commit a7143c2a8c48b234d78ec666193b942ae0b62ca3
Showing with 224 additions and 223 deletions.
  1. +5 −5 .github/workflows/android.yml
  2. +1 −0 .gitignore
  3. 0 {build → }/android/.gitignore
  4. +1 −1 {build → }/android/app/build.gradle
  5. 0 {build → }/android/app/src/main/AndroidManifest.xml
  6. 0 {build → }/android/app/src/main/java/net/minetest/minetest/CopyZipTask.java
  7. 0 {build → }/android/app/src/main/java/net/minetest/minetest/CustomEditText.java
  8. 0 {build → }/android/app/src/main/java/net/minetest/minetest/GameActivity.java
  9. 0 {build → }/android/app/src/main/java/net/minetest/minetest/MainActivity.java
  10. 0 {build → }/android/app/src/main/java/net/minetest/minetest/UnzipService.java
  11. BIN {build → }/android/app/src/main/res/drawable/background.png
  12. 0 {build → }/android/app/src/main/res/drawable/bg.xml
  13. 0 {build → }/android/app/src/main/res/layout/activity_main.xml
  14. BIN {build → }/android/app/src/main/res/mipmap/ic_launcher.png
  15. 0 {build → }/android/app/src/main/res/values/strings.xml
  16. 0 {build → }/android/app/src/main/res/values/styles.xml
  17. 0 {build → }/android/build.gradle
  18. 0 {build → }/android/gradle.properties
  19. BIN {build → }/android/gradle/wrapper/gradle-wrapper.jar
  20. 0 {build → }/android/gradle/wrapper/gradle-wrapper.properties
  21. 0 {build → }/android/gradlew
  22. 0 {build → }/android/gradlew.bat
  23. 0 {build → }/android/icons/aux1_btn.svg
  24. 0 {build → }/android/icons/camera_btn.svg
  25. 0 {build → }/android/icons/chat_btn.svg
  26. 0 {build → }/android/icons/chat_hide_btn.svg
  27. 0 {build → }/android/icons/chat_show_btn.svg
  28. 0 {build → }/android/icons/checkbox_tick.svg
  29. 0 {build → }/android/icons/debug_btn.svg
  30. 0 {build → }/android/icons/down.svg
  31. 0 {build → }/android/icons/drop_btn.svg
  32. 0 {build → }/android/icons/fast_btn.svg
  33. 0 {build → }/android/icons/fly_btn.svg
  34. 0 {build → }/android/icons/gear_icon.svg
  35. 0 {build → }/android/icons/inventory_btn.svg
  36. 0 {build → }/android/icons/joystick_bg.svg
  37. 0 {build → }/android/icons/joystick_center.svg
  38. 0 {build → }/android/icons/joystick_off.svg
  39. 0 {build → }/android/icons/jump_btn.svg
  40. 0 {build → }/android/icons/minimap_btn.svg
  41. 0 {build → }/android/icons/noclip_btn.svg
  42. 0 {build → }/android/icons/rangeview_btn.svg
  43. 0 {build → }/android/icons/rare_controls.svg
  44. 0 {build → }/android/icons/zoom.svg
  45. BIN {build → }/android/keystore-minetest.jks
  46. 0 {build → }/android/native/build.gradle
  47. +206 −0 android/native/jni/Android.mk
  48. 0 {build → }/android/native/jni/Application.mk
  49. 0 {build → }/android/native/src/main/AndroidManifest.xml
  50. 0 {build → }/android/settings.gradle
  51. +0 −206 build/android/native/jni/Android.mk
  52. +1 −1 doc/README.android
  53. +10 −10 util/bump_version.sh
@@ -8,15 +8,15 @@ on:
- 'lib/**.cpp'
- 'src/**.[ch]'
- 'src/**.cpp'
- 'build/android/**'
- 'android/**'
- '.github/workflows/android.yml'
pull_request:
paths:
- 'lib/**.[ch]'
- '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
@@ -76,6 +76,7 @@ doc/mkdocs/docs/*.md
doc/mkdocs/mkdocs.yml

## Build files
build/
CMakeFiles
Makefile
cmake_install.cmake
File renamed without changes.
@@ -52,7 +52,7 @@ android {

task prepareAssets() {
def assetsFolder = "build/assets"
def projRoot = "../../.."
def projRoot = "../.."
def gameToCopy = "minetest_game"

copy {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit a7143c2

Please sign in to comment.