From 8abd8ecb723549cd15b336f412591a33946a3d30 Mon Sep 17 00:00:00 2001 From: mslight Date: Wed, 20 Jul 2022 13:59:31 +0400 Subject: [PATCH] Opencv_android --- WORKSPACE | 13 ++++++++----- third_party/opencv_android.BUILD | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index e85e34d84..bb6fa6e4c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -35,8 +35,8 @@ http_archive( http_archive( name = "rules_cc", - strip_prefix = "rules_cc-main", - urls = ["https://github.com/bazelbuild/rules_cc/archive/main.zip"], + strip_prefix = "rules_cc-8bb0eb5c5ccd96b91753bb112096bb6993d16d13", + urls = ["https://github.com/bazelbuild/rules_cc/archive/8bb0eb5.zip"], ) http_archive( @@ -190,7 +190,7 @@ http_archive( new_local_repository( name = "linux_opencv", build_file = "@//third_party:opencv_linux.BUILD", - path = "/usr", + path = "/usr/local", ) new_local_repository( @@ -225,8 +225,9 @@ http_archive( build_file = "@//third_party:opencv_android.BUILD", strip_prefix = "OpenCV-android-sdk", type = "zip", - url = "https://github.com/opencv/opencv/releases/download/3.4.3/opencv-3.4.3-android-sdk.zip", -) + # url = "https://github.com/opencv/opencv/releases/download/3.4.10/opencv-3.4.10-#android-sdk.zip", + url = "https://github.com/opencv/opencv/releases/download/4.0.1/opencv-4.0.1-android-sdk.zip" + ) # After OpenCV 3.2.0, the pre-compiled opencv2.framework has google protobuf symbols, which will # trigger duplicate symbol errors in the linking stage of building a mediapipe ios app. @@ -416,3 +417,5 @@ libedgetpu_dependencies() load("@coral_crosstool//:configure.bzl", "cc_crosstool") cc_crosstool(name = "crosstool") +android_sdk_repository(name = "androidsdk", build_tools_version = "30.0.1") +android_ndk_repository(name = "androidndk", api_level=21) diff --git a/third_party/opencv_android.BUILD b/third_party/opencv_android.BUILD index 6c00457e7..0612987e5 100644 --- a/third_party/opencv_android.BUILD +++ b/third_party/opencv_android.BUILD @@ -5,7 +5,7 @@ licenses(["notice"]) # BSD license exports_files(["LICENSE"]) -OPENCV_LIBRARY_NAME = "libopencv_java3.so" +OPENCV_LIBRARY_NAME = "libopencv_java4.so" OPENCVANDROIDSDK_NATIVELIBS_PATH = "sdk/native/libs/"