Merge branch 'master' of https://github.com/HFVladimir/mediapipe
This commit is contained in:
commit
3329e2cb7c
|
@ -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,7 +225,8 @@ 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
|
||||
|
|
2
third_party/opencv_android.BUILD
vendored
2
third_party/opencv_android.BUILD
vendored
|
@ -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/"
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user