~xdavidwu/saf-cephfs

aa1ec6adfbb8336ad2cba0ef27526fb1733cf788 — Pinghao Wu 5 days ago 28f70d5
build: update toolchain
3 files changed, 6 insertions(+), 6 deletions(-)

M Containerfile
M build.gradle
M gradle/wrapper/gradle-wrapper.properties
M Containerfile => Containerfile +1 -1
@@ 1,7 1,7 @@
FROM archlinux

RUN printf '[aurbuild]\nServer = https://aurbuild.xdavidwu.link\n' >> /etc/pacman.conf
RUN curl 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf73f137d4573defaa097dbf09544cff6b08a3fd3' | pacman-key -a - && pacman-key --init && pacman-key --lsign-key f73f137d4573defaa097dbf09544cff6b08a3fd3 && pacman -Syu --noconfirm && pacman -S --noconfirm jdk21-openjdk android-sdk-cmdline-tools-latest  android-platform-35 android-sdk-build-tools=r35.0.1-1 android-ndk android-aarch64-openssl clang cmake ninja python-yaml && rm /var/cache/pacman/pkg/* && mkdir /build
RUN curl 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf73f137d4573defaa097dbf09544cff6b08a3fd3' | pacman-key -a - && pacman-key --init && pacman-key --lsign-key f73f137d4573defaa097dbf09544cff6b08a3fd3 && pacman -Syu --noconfirm && pacman -S --noconfirm jdk21-openjdk android-sdk-cmdline-tools-latest  android-platform-36 android-sdk-build-tools=r35.0.1-1 android-ndk android-aarch64-openssl clang cmake ninja python-yaml && rm /var/cache/pacman/pkg/* && mkdir /build

WORKDIR /build


M build.gradle => build.gradle +4 -4
@@ 4,7 4,7 @@ buildscript {
		mavenCentral()
	}
	dependencies {
		classpath 'com.android.tools.build:gradle:8.6.1'
		classpath 'com.android.tools.build:gradle:8.9.0'
	}
}
apply plugin: 'com.android.application'


@@ 16,14 16,14 @@ repositories {

android {
	namespace 'org.safcephfs'
	compileSdkVersion 'android-35'
	compileSdkVersion 'android-36'
	buildToolsVersion '35.0.1'
	ndkPath '/opt/android-ndk'
	ndkVersion '28.0.13004108'

	defaultConfig {
		minSdkVersion 26
		targetSdkVersion 35
		targetSdkVersion 36
		externalNativeBuild {
			cmake {
				arguments '-DWITH_MANPAGE=OFF', '-DWITH_RDMA=OFF', '-DWITH_KVS=OFF', '-DWITH_FUSE=OFF', '-DWITH_BLUESTORE=OFF', '-DWITH_XFS=OFF', '-DWITH_RBD=OFF', '-DWITH_OPENLDAP=OFF', '-DWITH_RADOSGW=OFF', '-DWITH_LZ4=OFF', '-DWITH_KRBD=OFF', '-DWITH_LTTNG=OFF', '-DWITH_MGR=OFF', '-DWITH_BABELTRACE=OFF', '-DWITH_CEPHFS=OFF', '-DWITH_LIBRADOSSTRIPER=OFF', '-DWITH_TESTS=OFF', '-DWITH_REENTRANT_STRSIGNAL=ON', '-DWITH_SYSTEMD=OFF', '-DWITH_MGR_DASHBOARD_FRONTEND=OFF', '-DWITH_RADOSGW_KAFKA_ENDPOINT=OFF', '-DWITH_RADOSGW_AMQP_ENDPOINT=OFF', '-DWITH_RADOSGW_BEAST_OPENSSL=OFF', '-DDEBUG_GATHER=OFF', '-DWITH_JAEGER=OFF', '-DWITH_CEPHFS_JAVA=ON', '-DOPENSSL_INCLUDE_DIR:FILEPATH=/opt/android-libs/aarch64/include/', '-DOPENSSL_CRYPTO_LIBRARY=/opt/android-libs/aarch64/lib/libcrypto.so', '-DWITH_SYSTEM_BOOST=OFF', '-DWITH_LIBCEPHSQLITE=OFF', '-DWITH_RADOSGW_D4N=OFF'


@@ 49,7 49,7 @@ android {
			// agp weirdness: specify version to use system cmake
			// https://developer.android.com/reference/tools/gradle-api/8.1/com/android/build/api/dsl/Cmake#version()
			// TODO: use cmake from android-sdk?
			version '3.31.5'
			version '4.0.1'
		}
	}


M gradle/wrapper/gradle-wrapper.properties => gradle/wrapper/gradle-wrapper.properties +1 -1
@@ 1,6 1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME