diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2016-04-13 14:14:04 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2016-04-28 12:28:42 -0400 |
| commit | e41673820ffe200df78b1ec185ccb9d9ca962ae1 (patch) | |
| tree | 94c0fda8c113920eb07bc97d03c7c551f8b6146f /build/android/jni | |
| parent | 7baddd173591cc9394d57cdb265f978495314f7a (diff) | |
| download | minetest-e41673820ffe200df78b1ec185ccb9d9ca962ae1.tar.gz minetest-e41673820ffe200df78b1ec185ccb9d9ca962ae1.tar.bz2 minetest-e41673820ffe200df78b1ec185ccb9d9ca962ae1.zip | |
Upgrade Android build to Gradle build system
The old Ant build system has been deprecated for a while and new development is focused on Gradle.
I also removed a hardcoded string that lint caught and moved the patch files to a subdirectory.
I left the JNI files in the root directory.
Diffstat (limited to 'build/android/jni')
| -rw-r--r-- | build/android/jni/Android.mk | 32 | ||||
| -rw-r--r-- | build/android/jni/Application.mk | 3 |
2 files changed, 18 insertions, 17 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 92738e6cc..e8534eaac 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -69,13 +69,13 @@ GPROF_DEF=-DGPROF endif LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ \ - -DHAVE_TOUCHSCREENGUI \ - -DUSE_CURL=1 \ - -DUSE_SOUND=1 \ - -DUSE_FREETYPE=1 \ - -DUSE_LEVELDB=$(HAVE_LEVELDB) \ - $(GPROF_DEF) \ - -pipe -fstrict-aliasing + -DHAVE_TOUCHSCREENGUI \ + -DUSE_CURL=1 \ + -DUSE_SOUND=1 \ + -DUSE_FREETYPE=1 \ + -DUSE_LEVELDB=$(HAVE_LEVELDB) \ + $(GPROF_DEF) \ + -pipe -fstrict-aliasing ifndef NDEBUG LOCAL_CFLAGS += -g -D_DEBUG -O0 -fno-omit-frame-pointer @@ -95,8 +95,8 @@ ifeq ($(TARGET_ARCH_ABI),x86) LOCAL_CFLAGS += -fno-stack-protector endif -LOCAL_C_INCLUDES := \ - jni/src jni/src/sqlite \ +LOCAL_C_INCLUDES := \ + jni/src \ jni/src/script \ jni/src/lua/src \ jni/src/json \ @@ -111,7 +111,7 @@ LOCAL_C_INCLUDES := \ deps/leveldb/include \ deps/sqlite/ -LOCAL_SRC_FILES := \ +LOCAL_SRC_FILES := \ jni/src/ban.cpp \ jni/src/camera.cpp \ jni/src/cavegen.cpp \ @@ -261,7 +261,7 @@ LOCAL_SRC_FILES := \ # intentionally kept out (we already build openssl itself): jni/src/util/sha256.c # Network -LOCAL_SRC_FILES += \ +LOCAL_SRC_FILES += \ jni/src/network/connection.cpp \ jni/src/network/networkpacket.cpp \ jni/src/network/clientopcodes.cpp \ @@ -270,7 +270,7 @@ LOCAL_SRC_FILES += \ jni/src/network/serverpackethandler.cpp \ # lua api -LOCAL_SRC_FILES += \ +LOCAL_SRC_FILES += \ jni/src/script/common/c_content.cpp \ jni/src/script/common/c_converter.cpp \ jni/src/script/common/c_internal.cpp \ @@ -310,11 +310,10 @@ LOCAL_SRC_FILES += \ jni/src/script/scripting_mainmenu.cpp #freetype2 support -LOCAL_SRC_FILES += \ - jni/src/cguittfont/xCGUITTFont.cpp +LOCAL_SRC_FILES += jni/src/cguittfont/xCGUITTFont.cpp -# lua -LOCAL_SRC_FILES += \ +# Lua +LOCAL_SRC_FILES += \ jni/src/lua/src/lapi.c \ jni/src/lua/src/lauxlib.c \ jni/src/lua/src/lbaselib.c \ @@ -374,3 +373,4 @@ ifdef GPROF $(call import-module,android-ndk-profiler) endif $(call import-module,android/native_app_glue) + diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk index b7ffc56a1..53467059a 100644 --- a/build/android/jni/Application.mk +++ b/build/android/jni/Application.mk @@ -1,4 +1,4 @@ -# NDK_TOOLCHAIN_VERSION := clang3.3 +# NDK_TOOLCHAIN_VERSION := clang3.8 APP_PLATFORM := android-9 APP_MODULES := minetest @@ -6,3 +6,4 @@ APP_STL := gnustl_static APP_CPPFLAGS += -fexceptions APP_GNUSTL_FORCE_CPP_FEATURES := rtti + |