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

Unified Diff: build/secondary/testing/gtest/BUILD.gn

Issue 2168973002: Remove obsolete gtest configurations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « no previous file | testing/gtest.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/secondary/testing/gtest/BUILD.gn
diff --git a/build/secondary/testing/gtest/BUILD.gn b/build/secondary/testing/gtest/BUILD.gn
index a03ff7c3dae280f840a1ca125bd5f70cbd0fa0e9..16423d0c409305502675d58d1259a66a8bb9915e 100644
--- a/build/secondary/testing/gtest/BUILD.gn
+++ b/build/secondary/testing/gtest/BUILD.gn
@@ -25,34 +25,6 @@ config("gtest_config") {
if (is_win) {
cflags = [ "/wd4800" ] # Unused variable warning.
}
-
- if (is_posix) {
- defines += [
- # gtest isn't able to figure out when RTTI is disabled for gcc
- # versions older than 4.3.2, and assumes it's enabled. Our Mac
danakj 2016/07/21 18:54:58 I currently have gcc 4.8.4, so that's a long way f
tzik 2016/07/21 19:06:24 Yes. According to the comment around the feature d
- # and Linux builds disable RTTI, and cannot guarantee that the
- # compiler will be 4.3.2. or newer. The Mac, for example, uses
- # 4.2.1 as that is the latest available on that platform. gtest
- # must be instructed that RTTI is disabled here, and for any
- # direct dependents that might include gtest headers.
- "GTEST_HAS_RTTI=0",
- ]
- }
-
- if (is_android) {
- defines += [
- # We want gtest features that use tr1::tuple, but we currently
- # don't support the variadic templates used by libstdc++'s
- # implementation. gtest supports this scenario by providing its
- # own implementation but we must opt in to it.
- "GTEST_USE_OWN_TR1_TUPLE=1",
danakj 2016/07/21 18:54:58 This looks ok to remove, we support variadic templ
-
- # GTEST_USE_OWN_TR1_TUPLE only works if GTEST_HAS_TR1_TUPLE is set.
- # gtest r625 made it so that GTEST_HAS_TR1_TUPLE is set to 0
- # automatically on android, so it has to be set explicitly here.
- "GTEST_HAS_TR1_TUPLE=1",
- ]
- }
}
config("gtest_direct_config") {
« no previous file with comments | « no previous file | testing/gtest.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698