Skip to content

Commit 48877c6

Browse files
committed
Update Android build.
1 parent 7bd6cf7 commit 48877c6

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

application/platforms/android/gradle/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ apply plugin: 'com.android.application'
22

33
android {
44
namespace "$$NAMESPACE$$"
5-
compileSdkVersion 33
5+
compileSdkVersion 34
66

77
defaultConfig {
88
minSdkVersion 26
9-
targetSdkVersion 33
9+
targetSdkVersion 34
1010

1111
ndk {
1212
abiFilters $$ABIS$$
1313
}
1414
}
1515

16-
ndkVersion '25.1.8937393'
16+
ndkVersion '26.3.11579264'
1717

1818
buildTypes {
1919
debug {

application/platforms/android/gradle/toplevel.build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.3.1'
9+
classpath 'com.android.tools.build:gradle:8.4.0'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files

tools/setup_android_toolchain.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515
# Grab from https://developer.android.com/studio
1616
# Adjust as necessary. Not sure if there's a generic way to do this ...
1717
echo "=== Downloading command line tools for Linux ==="
18-
VERSION=linux-8512546
18+
VERSION=linux-11076708
1919
FILENAME=commandlinetools-${VERSION}_latest.zip
2020
wget https://dl.google.com/android/repository/$FILENAME || exit 1
2121

@@ -30,9 +30,9 @@ mv cmdline-tools/{NOTICE.txt,bin,lib,source.properties} cmdline-tools/tools
3030

3131
export PATH="$PATH:$ANDROID_HOME/cmdline-tools/tools/bin:$ANDROID_HOME/platform-tools"
3232

33-
echo "=== Make sure JDK 11 is enabled (e.g. for Arch) ==="
34-
echo " pacman -S jre11-openjdk"
35-
echo " archlinux-java set java-11-openjdk"
33+
echo "=== Make sure JDK 17 is enabled (e.g. for Arch) ==="
34+
echo " pacman -S jre17-openjdk"
35+
echo " archlinux-java set java-17-openjdk"
3636

3737
echo "=== Automatically accepting all relevant licenses ==="
3838
yes | sdkmanager --licenses >/dev/null 2>&1 || exit 1

util/dynamic_library.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "dynamic_library.hpp"
2424
#include "logging.hpp"
2525
#include <stdexcept>
26+
#include <utility>
2627

2728
#ifdef _WIN32
2829
#define WIN32_LEAN_AND_MEAN

0 commit comments

Comments
 (0)