From e2846696ac3d45f8f74d810c362a30f45c0ffe2a Mon Sep 17 00:00:00 2001 From: benjaminwan Date: Mon, 20 Jun 2022 10:25:25 +0800 Subject: [PATCH] edit android.yml --- .github/workflows/android.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index bcac6ff..3400714 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -42,23 +42,23 @@ jobs: 7z x opencv-mobile-3.4.15-android.7z -aoa mv opencv-mobile-3.4.15-android/sdk OcrLibrary/src - # 下载ncnn-20210720-android.zip并解压到OcrLibrary/src/main/ncnn - - name: Download ncnn-20210720-android.zip + # 下载ncnn-20220420-android.zip并解压到OcrLibrary/src/main/ncnn + - name: Download ncnn-20220420-android.zip run: | - wget https://github.com/Tencent/ncnn/releases/download/20210720/ncnn-20210720-android.zip -O ncnn-20210720-android.zip - unzip -q ncnn-20210720-android.zip - mv ncnn-20210720-android OcrLibrary/src/main/ncnn + wget https://github.com/Tencent/ncnn/releases/download/20220420/ncnn-20220420-android.zip -O ncnn-20220420-android.zip + unzip -q ncnn-20220420-android.zip + mv ncnn-20220420-android OcrLibrary/src/main/ncnn sed -i -e 's/ INTERFACE_COMPILE_OPTIONS "-fno-rtti;-fno-exceptions"/#&/' OcrLibrary/src/main/ncnn/arm64-v8a/lib/cmake/ncnn/ncnn.cmake sed -i -e 's/ INTERFACE_COMPILE_OPTIONS "-fno-rtti;-fno-exceptions"/#&/' OcrLibrary/src/main/ncnn/armeabi-v7a/lib/cmake/ncnn/ncnn.cmake sed -i -e 's/ INTERFACE_COMPILE_OPTIONS "-fno-rtti;-fno-exceptions"/#&/' OcrLibrary/src/main/ncnn/x86/lib/cmake/ncnn/ncnn.cmake sed -i -e 's/ INTERFACE_COMPILE_OPTIONS "-fno-rtti;-fno-exceptions"/#&/' OcrLibrary/src/main/ncnn/x86_64/lib/cmake/ncnn/ncnn.cmake - # 下载ncnn-20210720-android-vulkan.zip并解压到OcrLibrary/src/main/ncnn-vulkan - - name: Download ncnn-20210720-android-vulkan.zip + # 下载ncnn-20220420-android-vulkan.zip并解压到OcrLibrary/src/main/ncnn-vulkan + - name: Download ncnn-20220420-android-vulkan.zip run: | - wget https://github.com/Tencent/ncnn/releases/download/20210720/ncnn-20210720-android-vulkan.zip -O ncnn-20210720-android-vulkan.zip - unzip -q ncnn-20210720-android-vulkan.zip - mv ncnn-20210720-android-vulkan OcrLibrary/src/main/ncnn-vulkan + wget https://github.com/Tencent/ncnn/releases/download/20220420/ncnn-20220420-android-vulkan.zip -O ncnn-20220420-android-vulkan.zip + unzip -q ncnn-20220420-android-vulkan.zip + mv ncnn-20220420-android-vulkan OcrLibrary/src/main/ncnn-vulkan sed -i -e 's/ INTERFACE_COMPILE_OPTIONS "-fno-rtti;-fno-exceptions"/#&/' OcrLibrary/src/main/ncnn-vulkan/arm64-v8a/lib/cmake/ncnn/ncnn.cmake sed -i -e 's/ INTERFACE_COMPILE_OPTIONS "-fno-rtti;-fno-exceptions"/#&/' OcrLibrary/src/main/ncnn-vulkan/armeabi-v7a/lib/cmake/ncnn/ncnn.cmake sed -i -e 's/ INTERFACE_COMPILE_OPTIONS "-fno-rtti;-fno-exceptions"/#&/' OcrLibrary/src/main/ncnn-vulkan/x86/lib/cmake/ncnn/ncnn.cmake