From d3ca091050d58ebf6fe1b60e5ef7458e5a88f1a3 Mon Sep 17 00:00:00 2001 From: Pinghao Wu Date: Mon, 14 Oct 2024 11:47:40 +0800 Subject: [PATCH] Revert "move to android-ndk-beta" This reverts commit 1a21f55b63f7d097dbc21229d74dc01d20e1f56e. --- Containerfile | 6 +++--- build.gradle | 2 +- src/main/jniLibs/arm64-v8a/libc++_shared.so | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Containerfile b/Containerfile index 3677f70..2444603 100644 --- a/Containerfile +++ b/Containerfile @@ -1,14 +1,14 @@ 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 jdk17-openjdk android-sdk-cmdline-tools-latest android-platform-33 android-sdk-build-tools-33 android-ndk-beta android-aarch64-boost android-aarch64-openssl 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 jdk17-openjdk android-sdk-cmdline-tools-latest android-platform-33 android-sdk-build-tools-33 android-ndk android-aarch64-boost android-aarch64-openssl cmake ninja python-yaml && mkdir /build WORKDIR /build # XXX: use /etc/profile.d/*.sh instead? ENV ANDROID_HOME=/opt/android-sdk ENV ANDROID_SDK_ROOT=/opt/android-sdk -ENV ANDROID_NDK=/opt/android-ndk-beta -ENV ANDROID_NDK_HOME=/opt/android-ndk-beta +ENV ANDROID_NDK=/opt/android-ndk +ENV ANDROID_NDK_HOME=/opt/android-ndk LABEL org.opencontainers.image.source=https://github.com/xdavidwu/saf-cephfs diff --git a/build.gradle b/build.gradle index 64d914f..b5e99ea 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 'android-33' buildToolsVersion '33' - ndkPath '/opt/android-ndk-beta' + ndkPath '/opt/android-ndk' defaultConfig { minSdkVersion 24 diff --git a/src/main/jniLibs/arm64-v8a/libc++_shared.so b/src/main/jniLibs/arm64-v8a/libc++_shared.so index 0eabf12..d1899a5 120000 --- a/src/main/jniLibs/arm64-v8a/libc++_shared.so +++ b/src/main/jniLibs/arm64-v8a/libc++_shared.so @@ -1 +1 @@ -/opt/android-ndk-beta/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so \ No newline at end of file +/opt/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so \ No newline at end of file -- 2.45.2