From 4114e3047bd2cc975d829f24d73991650817ad66 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Sun, 31 Oct 2021 23:32:25 +0100 Subject: Update Android to new dependency repo (#11690) --- android/app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'android/app') diff --git a/android/app/build.gradle b/android/app/build.gradle index 53fe85910..234868f92 100644 --- 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' } -- cgit v1.2.3