chromium/src
0
Fork 0
Code Activity

Use gtest's own implementation of tr1::tuple on Android.

Browse Source 
Android's libstdc++ doesn't include tr1:: tuple so we must use gtest's instead. This will allow us build gtest/gmock on Android.

BUG=
TEST=
Review URL: http://codereview.chromium.org/7827004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99636 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
jnd@chromium.org
2011-09-05 10:03:47 +00:00
parent c8a7266a5d
commit fbf26a0e72
1 changed files with 4 additions and 4 deletions

8
testing/gtest.gyp

@ -78,10 +78,10 @@
],
},
}],
['clang==1', {
# We want gtest features that use tr1::tuple, but clang currently
# doesn't support the variadic templates used by libstdc++'s
# implementation. gtest supports this scenario by providing its
['clang==1 or OS=="android"', {
# 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.
'defines': [
'GTEST_USE_OWN_TR1_TUPLE=1',