diff options
| author | rubenwardy <rw@rubenwardy.com> | 2021-10-18 18:33:25 +0100 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2021-10-18 18:33:25 +0100 |
| commit | e5cfdd369ed96a7906a6ed6de7eb3878a10fc57c (patch) | |
| tree | 63631ea60ee6bec0e155540022130f2d04732e68 /android | |
| parent | c61d8cfb857bbc591ae87f662e0e6e67b813a5c4 (diff) | |
| download | minetest-e5cfdd369ed96a7906a6ed6de7eb3878a10fc57c.tar.gz minetest-e5cfdd369ed96a7906a6ed6de7eb3878a10fc57c.tar.bz2 minetest-e5cfdd369ed96a7906a6ed6de7eb3878a10fc57c.zip | |
Update deps ref
Diffstat (limited to 'android')
| -rw-r--r-- | android/native/build.gradle | 5 | ||||
| -rw-r--r-- | android/native/jni/Android.mk | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/android/native/build.gradle b/android/native/build.gradle index a7f095641..d58a2dcc5 100644 --- a/android/native/build.gradle +++ b/android/native/build.gradle @@ -51,16 +51,17 @@ android { // get precompiled deps def folder = 'minetest_android_deps_binaries' +def deps_ref = "342eb18b7512462585a33bc9eef0b68298087151" task downloadDeps(type: Download) { - src 'https://github.com/minetest/' + folder + '/archive/master.zip' + src 'https://github.com/minetest/' + folder + '/archive/' + deps_ref + '.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") + def f = file("$buildDir/" + folder + "-" + deps_ref) if (!deps.exists() && !f.exists()) { from zipTree(downloadDeps.dest) diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index 5039f325e..73df04945 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -14,7 +14,7 @@ include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := Irrlicht -LOCAL_SRC_FILES := deps/Android/Irrlicht/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libIrrlichtMt.a +LOCAL_SRC_FILES := deps/Android/Irrlicht/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libIrrlicht.a include $(PREBUILT_STATIC_LIBRARY) #include $(CLEAR_VARS) @@ -47,6 +47,18 @@ LOCAL_MODULE := OpenAL LOCAL_SRC_FILES := deps/Android/OpenAL-Soft/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libopenal.a include $(PREBUILT_STATIC_LIBRARY) +# You can use `OpenSSL and Crypto` instead `mbedTLS mbedx509 mbedcrypto`, +#but it increase APK size on ~0.7MB +#include $(CLEAR_VARS) +#LOCAL_MODULE := OpenSSL +#LOCAL_SRC_FILES := deps/Android/OpenSSL/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libssl.a +#include $(PREBUILT_STATIC_LIBRARY) + +#include $(CLEAR_VARS) +#LOCAL_MODULE := Crypto +#LOCAL_SRC_FILES := deps/Android/OpenSSL/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libcrypto.a +#include $(PREBUILT_STATIC_LIBRARY) + include $(CLEAR_VARS) LOCAL_MODULE := Vorbis LOCAL_SRC_FILES := deps/Android/Vorbis/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libvorbis.a @@ -195,6 +207,7 @@ LOCAL_SRC_FILES += \ 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 +#OpenSSL Crypto LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES |