cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/HFVladimir/mediapipe

Browse Source
This commit is contained in:
mslight 2022-07-20 14:36:16 +04:00
commit 3329e2cb7c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
WORKSPACE
View File

@ -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.
@ -415,4 +416,4 @@ load("@libedgetpu//:workspace.bzl", "libedgetpu_dependencies")
libedgetpu_dependencies()
load("@coral_crosstool//:configure.bzl", "cc_crosstool")
cc_crosstool(name = "crosstool")
cc_crosstool(name = "crosstool")

2
third_party/opencv_android.BUILD vendored
View File

@ -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/"