已合并
回退 'Pull Request !328 : testfwk_developer_test仓 googletest_1.13.0 升级' #330
openharmony_ci创建于 2024年1月26日
回退 'Pull Request !328 : testfwk_developer_test仓 googletest_1.13.0 升级' #330
已合并
共 1 个文件变更+0-4
| @@ -18,9 +18,6 @@ config("gtest_private_config") { | |||
| 18 | 18 | ||
| 19 | config("gtest_config") { | 19 | config("gtest_config") { |
| 20 | include_dirs = [ "//third_party/googletest/googletest/include" ] | 20 | include_dirs = [ "//third_party/googletest/googletest/include" ] |
| 21 | - cflags = [ "-std=c++17" ] | ||
| 22 | - cflags_objcc = [ "-std=c++17" ] | ||
| 23 | - cflags_cc = [ "-std=c++17" ] | ||
| 24 | } | 21 | } |
| 25 | 22 | ||
| 26 | static_library("gtest") { | 23 | static_library("gtest") { |
| @@ -56,7 +53,6 @@ static_library("gtest") { | |||
| 56 | "//third_party/googletest/googletest/include/gtest/internal/gtest-string.h", | 53 | "//third_party/googletest/googletest/include/gtest/internal/gtest-string.h", |
| 57 | "//third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h", | 54 | "//third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h", |
| 58 | "//third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h", | 55 | "//third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h", |
| 59 | - "//third_party/googletest/googletest/src/gtest-assertion-result.cc", | ||
| 60 | "//third_party/googletest/googletest/src/gtest-death-test.cc", | 56 | "//third_party/googletest/googletest/src/gtest-death-test.cc", |
| 61 | "//third_party/googletest/googletest/src/gtest-filepath.cc", | 57 | "//third_party/googletest/googletest/src/gtest-filepath.cc", |
| 62 | "//third_party/googletest/googletest/src/gtest-internal-inl.h", | 58 | "//third_party/googletest/googletest/src/gtest-internal-inl.h", |