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

testing/gtest.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'gtest',
       'type': 'static_library',
       'sources': [
@@ skipping 60 matching lines @@
             # must be instructed that RTTI is disabled here, and for any
             # direct dependents that might include gtest headers.
             'GTEST_HAS_RTTI=0',
           ],
           'direct_dependent_settings': {
             'defines': [
               'GTEST_HAS_RTTI=0',
             ],
           },
         }],
-        ['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',
           ],
           'direct_dependent_settings': {
             'defines': [
               'GTEST_USE_OWN_TR1_TUPLE=1',
             ],
           },
         }],
@@ skipping 30 matching lines @@
       'type': 'static_library',
       'dependencies': [
         'gtest',
       ],
       'sources': [
         'gtest/src/gtest_main.cc',
       ],
     },
   ],
 }