Project import generated by Copybara.
GitOrigin-RevId: 1610e588e497817fae2d9a458093ab6a370e2972
This commit is contained in:
Vendored
+3
-11
@@ -18,18 +18,10 @@ exports_files(["LICENSE"])
|
||||
|
||||
cc_library(
|
||||
name = "libffmpeg",
|
||||
srcs = glob(
|
||||
[
|
||||
"lib/x86_64-linux-gnu/libav*.so",
|
||||
],
|
||||
),
|
||||
hdrs = glob(["include/x86_64-linux-gnu/libav*/*.h"]),
|
||||
includes = ["include"],
|
||||
linkopts = [
|
||||
"-lavcodec",
|
||||
"-lavformat",
|
||||
"-lavutil",
|
||||
"-l:libavcodec.so",
|
||||
"-l:libavformat.so",
|
||||
"-l:libavutil.so",
|
||||
],
|
||||
linkstatic = 1,
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
Vendored
+19
-20
@@ -9,34 +9,33 @@ exports_files(["LICENSE"])
|
||||
# 'apt-get install libopencv-core-dev libopencv-highgui-dev \'
|
||||
# ' libopencv-calib3d-dev libopencv-features2d-dev \'
|
||||
# ' libopencv-imgproc-dev libopencv-video-dev'
|
||||
# on Debian buster/Ubuntu 18.04.
|
||||
# on Debian Buster/Ubuntu 18.04.
|
||||
# If you install OpenCV separately, please modify the build rule accordingly.
|
||||
cc_library(
|
||||
name = "opencv",
|
||||
srcs = glob(
|
||||
[
|
||||
"lib/x86_64-linux-gnu/libopencv_core.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_calib3d.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_features2d.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_highgui.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_imgcodecs.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_imgproc.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_video.so",
|
||||
"lib/x86_64-linux-gnu/libopencv_videoio.so",
|
||||
],
|
||||
),
|
||||
hdrs = glob([
|
||||
# For OpenCV 3.x
|
||||
"include/opencv2/**/*.h*",
|
||||
# For OpenCV 4.x
|
||||
# "include/opencv4/opencv2/**/*.h*",
|
||||
#"include/aarch64-linux-gnu/opencv4/opencv2/cvconfig.h",
|
||||
#"include/arm-linux-gnueabihf/opencv4/opencv2/cvconfig.h",
|
||||
#"include/x86_64-linux-gnu/opencv4/opencv2/cvconfig.h",
|
||||
#"include/opencv4/opencv2/**/*.h*",
|
||||
]),
|
||||
includes = [
|
||||
# For OpenCV 3.x
|
||||
"include/",
|
||||
# For OpenCV 4.x
|
||||
# "include/opencv4/",
|
||||
#"include/aarch64-linux-gnu/opencv4/",
|
||||
#"include/arm-linux-gnueabihf/opencv4/",
|
||||
#"include/x86_64-linux-gnu/opencv4/",
|
||||
#"include/opencv4/",
|
||||
],
|
||||
linkopts = [
|
||||
"-l:libopencv_core.so",
|
||||
"-l:libopencv_calib3d.so",
|
||||
"-l:libopencv_features2d.so",
|
||||
"-l:libopencv_highgui.so",
|
||||
"-l:libopencv_imgcodecs.so",
|
||||
"-l:libopencv_imgproc.so",
|
||||
"-l:libopencv_video.so",
|
||||
"-l:libopencv_videoio.so",
|
||||
],
|
||||
linkstatic = 1,
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
+10
-10
@@ -1,5 +1,5 @@
|
||||
diff --git a/tensorflow/core/lib/monitoring/percentile_sampler.cc b/tensorflow/core/lib/monitoring/percentile_sampler.cc
|
||||
index b7c22ae77b..d0ba7b48b4 100644
|
||||
index b7c22ae77ba..d0ba7b48b4b 100644
|
||||
--- a/tensorflow/core/lib/monitoring/percentile_sampler.cc
|
||||
+++ b/tensorflow/core/lib/monitoring/percentile_sampler.cc
|
||||
@@ -29,7 +29,8 @@ namespace monitoring {
|
||||
@@ -24,22 +24,22 @@ index b7c22ae77b..d0ba7b48b4 100644
|
||||
}
|
||||
}
|
||||
diff --git a/tensorflow/core/platform/test.h b/tensorflow/core/platform/test.h
|
||||
index ba50783765..5de5ea01f0 100644
|
||||
index 94b4853a810..75589d04a60 100644
|
||||
--- a/tensorflow/core/platform/test.h
|
||||
+++ b/tensorflow/core/platform/test.h
|
||||
@@ -42,7 +42,6 @@ limitations under the License.
|
||||
#if defined(PLATFORM_GOOGLE) || defined(PLATFORM_GOOGLE_ANDROID)
|
||||
#include "testing/base/public/gmock.h" // IWYU pragma: export
|
||||
#else
|
||||
@@ -40,7 +40,6 @@ limitations under the License.
|
||||
// The advantages of using gmock matchers instead of self defined matchers are
|
||||
// better error messages, more maintainable tests and more test coverage.
|
||||
#if !defined(PLATFORM_GOOGLE) && !defined(PLATFORM_GOOGLE_ANDROID)
|
||||
-#include <gmock/gmock-generated-matchers.h>
|
||||
#include <gmock/gmock-matchers.h>
|
||||
#include <gmock/gmock-more-matchers.h>
|
||||
#include <gmock/gmock.h>
|
||||
#endif
|
||||
diff --git a/third_party/eigen3/eigen_archive.BUILD b/third_party/eigen3/eigen_archive.BUILD
|
||||
index dad592bec48..670017c2c0f 100644
|
||||
index 5514f774c35..1a38f76f4e9 100644
|
||||
--- a/third_party/eigen3/eigen_archive.BUILD
|
||||
+++ b/third_party/eigen3/eigen_archive.BUILD
|
||||
@@ -49,6 +49,13 @@ cc_library(
|
||||
@@ -53,6 +53,13 @@ cc_library(
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
@@ -52,4 +52,4 @@ index dad592bec48..670017c2c0f 100644
|
||||
+
|
||||
filegroup(
|
||||
name = "eigen_header_files",
|
||||
srcs = EIGEN_MPL2_HEADER_FILES,
|
||||
srcs = EIGEN_HEADERS,
|
||||
|
||||
Reference in New Issue
Block a user