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

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

Issue 227673008: Checkpoint work to get GN builds working on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge forward to 263376 Created 6 years, 8 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 | « ipc/BUILD.gn ('k') | tools/gn/secondary/third_party/libevent/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/secondary/testing/gtest/BUILD.gn
diff --git a/tools/gn/secondary/testing/gtest/BUILD.gn b/tools/gn/secondary/testing/gtest/BUILD.gn
index 91b755fb3c0e7f7133ab52394ba9ae39de28afe1..90f027d173be3821a8a60fa35c06ca4666f32285 100644
--- a/tools/gn/secondary/testing/gtest/BUILD.gn
+++ b/tools/gn/secondary/testing/gtest/BUILD.gn
@@ -35,6 +35,21 @@ config("gtest_config") {
"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",
+
+ # 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",
+ ]
+ }
}
static_library("gtest") {
« no previous file with comments | « ipc/BUILD.gn ('k') | tools/gn/secondary/third_party/libevent/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698