!449 回退 'Pull Request !430 : tools仓-googletest_1.13.0'

Merge pull request !449 from openharmony_ci/revert-merge-430-master
This commit is contained in:
openharmony_ci 2024-01-28 02:29:21 +00:00 committed by Gitee
commit db961ac2f5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -15,14 +15,10 @@ config("hcpptest_private_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ "//third_party/googletest/googletest" ] include_dirs = [ "//third_party/googletest/googletest" ]
ldflags = [ "-lstdc++" ] ldflags = [ "-lstdc++" ]
cflags_cc = [ "-std=c++17" ]
cflags = [ "-std=c++17" ]
} }
config("hcpptest_config") { config("hcpptest_config") {
include_dirs = [ "//third_party/googletest/googletest/include" ] include_dirs = [ "//third_party/googletest/googletest/include" ]
cflags_cc = [ "-std=c++17" ]
cflags = [ "-std=c++17" ]
ldflags = [ ldflags = [
"-lstdc++", "-lstdc++",
"-Wl,-rpath=./lib", "-Wl,-rpath=./lib",
@ -62,7 +58,6 @@ static_library("hcpptest") {
"//third_party/googletest/googletest/include/gtest/internal/gtest-string.h", "//third_party/googletest/googletest/include/gtest/internal/gtest-string.h",
"//third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h", "//third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h",
"//third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h", "//third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h",
"//third_party/googletest/googletest/src/gtest-assertion-result.cc",
"//third_party/googletest/googletest/src/gtest-death-test.cc", "//third_party/googletest/googletest/src/gtest-death-test.cc",
"//third_party/googletest/googletest/src/gtest-filepath.cc", "//third_party/googletest/googletest/src/gtest-filepath.cc",
"//third_party/googletest/googletest/src/gtest-internal-inl.h", "//third_party/googletest/googletest/src/gtest-internal-inl.h",