Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Unified Diff: third_party/googletest/BUILD.gn

Issue 2875143003: Roll googletest to 1.8.0+. (Closed)
Patch Set: Addressed feedback rebased. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/sequenced_socket_data_unittest.cc ('k') | third_party/googletest/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/googletest/BUILD.gn
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn
index d0a01adb5ff67a842c520b288ecbfa4256c9ac65..2ace19b81f72f8942de96e4fecacc165fde7866b 100644
--- a/third_party/googletest/BUILD.gn
+++ b/third_party/googletest/BUILD.gn
@@ -6,6 +6,11 @@ config("gtest_config") {
visibility = [ ":*" ] # gmock also shares this config.
defines = [
+ # Chromium always links googletest statically, so no API qualifier is
+ # necessary. The definition in gtest-port.h at the time of this writing
+ # causes crashes in content_browsertests.
+ "GTEST_API_=",
+
# In order to allow regex matches in gtest to be shared between Windows
# and other systems, we tell gtest to always use its internal engine.
"GTEST_HAS_POSIX_RE=0",
@@ -23,7 +28,7 @@ config("gtest_config") {
config("gmock_config") {
# Gmock headers need to be able to find themselves.
include_dirs = [
- "gmock_custom",
+ "custom",
"src/googlemock/include",
]
}
@@ -104,7 +109,7 @@ source_set("gmock") {
"src/googlemock/include/gmock/internal/gmock-port.h",
# gmock helpers.
- "gmock_custom/gmock/internal/custom/gmock-port.h",
+ "custom/gmock/internal/custom/gmock-port.h",
#"src/googlemock/src/gmock-all.cc", # Not needed by our build.
"src/googlemock/src/gmock-cardinalities.cc",
@@ -114,9 +119,6 @@ source_set("gmock") {
"src/googlemock/src/gmock.cc",
]
- # This project includes some stuff form gtest's guts.
- include_dirs = [ "src/googletest/include" ]
-
public_configs = [
":gmock_config",
":gtest_config",
« no previous file with comments | « net/socket/sequenced_socket_data_unittest.cc ('k') | third_party/googletest/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698