upgrade NDK version to compile smmla

GitOrigin-RevId: 339f252b7e7f74a5ecf858ab65bba4b1c15d285b
MegEngine · Oct 17, 2023 · 58f37a2 · 58f37a2
1 parent 46b01fe
commit 58f37a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/compiler/script/docker/Dockerfile b/compiler/script/docker/Dockerfile
@@ -54,5 +54,8 @@ RUN pip3 install lit
 # copy prebuilt megengine & mlir
 COPY llvm-project /root/llvm-project
 
+# copy NDK r25c
+RUN cd /root && wget http://brain-ftp.megvii-inc.com/android-ndk-r25c-linux.zip && unzip -X android-ndk-r25c-linux.zip && rm android-ndk-r25c-linux.zip
+
 # allow normal user to access root privilege
 RUN echo "engine-bot  ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
diff --git a/script/build_and_test_not_standard_os.sh b/script/build_and_test_not_standard_os.sh
@@ -233,7 +233,7 @@ check_key_words ${KERNEL_DIR}/runtime/install/lib/libTinyNN.a
 ./runtime/scripts/runtime_build.py --cross_build --kernel_dir ${KERNEL_DIR} --remove_old_build --cross_build_target_arch aarch64 --cross_build_target_os NOT_STANDARD_OS --build_with_ninja_verbose --build_tensor_alloc_sanity --build_with_profile --build_with_dump_tensor --build_for_debug
 python3 runtime/scripts/check_tinynn_lib.py --tinynn_lib ${KERNEL_DIR}/runtime/install/lib/libTinyNN.a
 # verify STANDARD_OS(android) build
-export NDK_ROOT=/root/android-ndk-r21
+export NDK_ROOT=/root/android-ndk-r25c
 ./runtime/scripts/runtime_build.py --cross_build --kernel_dir ${KERNEL_DIR} --remove_old_build --cross_build_target_arch aarch64 --cross_build_target_os ANDROID --build_with_ninja_verbose --build_tensor_alloc_sanity --build_with_profile --build_with_dump_tensor --build_for_debug --build_with_callback_register
 ./runtime/scripts/runtime_build.py --cross_build --kernel_dir ${KERNEL_DIR} --remove_old_build --cross_build_target_arch aarch64 --cross_build_target_os ANDROID --build_with_ninja_verbose --build_tensor_alloc_sanity --build_with_profile --build_with_dump_tensor
 check_key_words ${KERNEL_DIR}/runtime/install/lib/libTinyNN_share.so