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

Unified Diff: testing/gtest.gyp

Issue 7827004: Use gtest's own implementation of tr1::tuple on Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 4 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/gtest.gyp
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index 2b57742e961d0e7528080dccbe79375821b8658f..93c2f51865df559a0aa982042a26210a40850e47 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -78,10 +78,10 @@
],
},
}],
- ['clang==1', {
- # We want gtest features that use tr1::tuple, but clang currently
+ ['clang==1 or OS=="android"', {
+ # We want gtest features that use tr1::tuple, but we currently
# doesn't support the variadic templates used by libstdc++'s
Peter Beverloo 2011/09/01 12:34:08 doesn't -> don't
- # implementation. gtest supports this scenario by providing its
+ # implementation. gtest supports this scenario by providing its
# own implementation but we must opt in to it.
'defines': [
'GTEST_USE_OWN_TR1_TUPLE=1',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698