diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 16:17:57 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 16:17:57 +0000 |
| commit | f5c7758a7dd284a4d668744b385bdb759af8249c (patch) | |
| tree | 4c5e3e7099aa0cd78d4013dce3ea551c4683b187 /testing/gtest.gyp | |
| parent | c9694a520220384f30f6073869cf501db9257bc8 (diff) | |
| download | chromium_src-f5c7758a7dd284a4d668744b385bdb759af8249c.zip chromium_src-f5c7758a7dd284a4d668744b385bdb759af8249c.tar.gz chromium_src-f5c7758a7dd284a4d668744b385bdb759af8249c.tar.bz2 | |
Revert "Revert 147986 - [Android] Add remaining build/common.gypi changes from downstream and strip NOTIMPLEMENTED()s from official builds."
Relanding http://codereview.chromium.org/10816039/ but removing the
clang parts and fixing x86.
This reverts commit 7fc96c8b734fc9bc8152329d99e8ee3f3de14a65.
BUG=137569
Review URL: https://chromiumcodereview.appspot.com/10809081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gtest.gyp')
| -rw-r--r-- | testing/gtest.gyp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp index b01c694..de32937 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -108,6 +108,16 @@ ], }, }], + ['OS=="android" and android_app_abi=="x86"', { + 'defines': [ + 'GTEST_HAS_CLONE=0', + ], + 'direct_dependent_settings': { + 'defines': [ + 'GTEST_HAS_CLONE=0', + ], + }, + }], ['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 |