Przeglądaj źródła

app: update to NDK 29

jkds 1 miesiąc temu
rodzic
commit
4aaf35df7a
2 zmienionych plików z 7 dodań i 7 usunięć
  1. 6 6
      bin/app/Dockerfile
  2. 1 1
      bin/app/build.rs

+ 6 - 6
bin/app/Dockerfile

@@ -38,14 +38,14 @@ RUN ${ANDROID_HOME}/tools/bin/sdkmanager --update | grep -v = || true
 
 # Install Android NDK
 RUN cd /opt/ && \
-    wget -q http://dl.google.com/android/repository/android-ndk-r25-linux.zip && \
-    unzip -q android-ndk-r25-linux.zip && \
-    rm android-ndk-r25-linux.zip
-ENV NDK_HOME /opt/android-ndk-r25/
+    wget -q https://dl.google.com/android/repository/android-ndk-r29-linux.zip && \
+    unzip -q android-ndk-r29-linux.zip && \
+    rm android-ndk-r29-linux.zip
+ENV NDK_HOME /opt/android-ndk-r29/
 
 # Needed for cross compiling openssl which is used by bundled sqlcipher in drk
-ENV AR /opt/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
-ENV RANLIB /opt/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
+ENV AR /opt/android-ndk-r29/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
+ENV RANLIB /opt/android-ndk-r29/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
 
 # Copy contents to container. Should only use this on a clean directory
 WORKDIR /root/

+ 1 - 1
bin/app/build.rs

@@ -53,7 +53,7 @@ fn main() {
 
     if target_os == "android" {
         // Since we run this inside a container, we can just hardcore the paths directly
-        println!("cargo:rustc-link-search=/opt/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/14.0.6/lib/linux/");
+        println!("cargo:rustc-link-search=/opt/android-ndk-r29/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/21/lib/linux/");
         match target_arch.as_str() {
             "aarch64" => println!("cargo:rustc-link-lib=static=clang_rt.builtins-aarch64-android"),
             "arm" => println!("cargo:rustc-link-lib=static=clang_rt.builtins-arm-android"),