third_party/googletest: use gtest-all.cc and gmock-all.cc

Upstream googletest has refactored googletest's assertion result into gtest-assertion-result.h and gtest-assertion-result.cc. To avoid future issues, only use gtest-all.cc and gmock-all.cc as source files. Bug: 660, b/228906345 Change-Id: Ib7756f78a6d416079db14445ea22778a3631936e Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/92500 Reviewed-by: Wyatt Hepler <[email protected]> Reviewed-by: Ted Pudlik <[email protected]> Pigweed-Auto-Submit: Jonathan Cardy <[email protected]> Commit-Queue: Auto-Submit <[email protected]>
google · Apr 26, 2022 · 522834d · 522834d
1 parent dcd0d9f
commit 522834d
Showing 1 changed file with 6 additions and 48 deletions.
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn
@@ -41,55 +41,13 @@ if (dir_pw_third_party_googletest != "") {
       "$dir_pw_third_party_googletest/googletest/include/gtest/gtest-spi.h",
       "$dir_pw_third_party_googletest/googletest/include/gtest/gtest.h",
     ]
+
+    # Only add the "*-all.cc" files (and no headers) to improve maintainability
+    # from upstream refactoring. The "*-all.cc" files include the respective
+    # source files.
     sources = [
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/gmock-actions.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/gmock-cardinalities.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/gmock-function-mocker.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/gmock-matchers.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/gmock-more-actions.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/gmock-more-matchers.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/gmock-nice-strict.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/gmock-spec-builders.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/internal/custom/gmock-port.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/internal/gmock-internal-utils.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/internal/gmock-port.h",
-      "$dir_pw_third_party_googletest/googlemock/include/gmock/internal/gmock-pp.h",
-      "$dir_pw_third_party_googletest/googlemock/src/gmock-cardinalities.cc",
-      "$dir_pw_third_party_googletest/googlemock/src/gmock-internal-utils.cc",
-      "$dir_pw_third_party_googletest/googlemock/src/gmock-matchers.cc",
-      "$dir_pw_third_party_googletest/googlemock/src/gmock-spec-builders.cc",
-      "$dir_pw_third_party_googletest/googlemock/src/gmock.cc",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/gtest-death-test.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/gtest-matchers.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/gtest-message.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/gtest-param-test.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/gtest-printers.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/gtest-test-part.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/gtest-typed-test.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/gtest_pred_impl.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/gtest_prod.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/internal/custom/gtest-port.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/internal/custom/gtest-printers.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/internal/custom/gtest.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/internal/gtest-death-test-internal.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/internal/gtest-filepath.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/internal/gtest-internal.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/internal/gtest-param-util.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/internal/gtest-port-arch.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/internal/gtest-port.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/internal/gtest-string.h",
-      "$dir_pw_third_party_googletest/googletest/include/gtest/internal/gtest-type-util.h",
-      "$dir_pw_third_party_googletest/googletest/src/gtest-death-test.cc",
-      "$dir_pw_third_party_googletest/googletest/src/gtest-filepath.cc",
-      "$dir_pw_third_party_googletest/googletest/src/gtest-internal-inl.h",
-      "$dir_pw_third_party_googletest/googletest/src/gtest-matchers.cc",
-      "$dir_pw_third_party_googletest/googletest/src/gtest-port.cc",
-      "$dir_pw_third_party_googletest/googletest/src/gtest-printers.cc",
-      "$dir_pw_third_party_googletest/googletest/src/gtest-test-part.cc",
-      "$dir_pw_third_party_googletest/googletest/src/gtest-typed-test.cc",
-      "$dir_pw_third_party_googletest/googletest/src/gtest.cc",
+      "$dir_pw_third_party_googletest/googlemock/src/gmock-all.cc",
+      "$dir_pw_third_party_googletest/googletest/src/gtest-all.cc",
     ]
   }