testing/gtest.gyp - Issue 10809081: Revert "Revert 147986 - [Android] Add remaining build/common.gypi changes from downstream and strip…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: testing/gtest.gyp

Issue 10809081: Revert "Revert 147986 - [Android] Add remaining build/common.gypi changes from downstream and strip… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: added comment re: death Created 8 years, 5 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

Index: testing/gtest.gyp

diff --git a/testing/gtest.gyp b/testing/gtest.gyp

index b01c6948617e687cd77e425138436a69b4d3c940..de32937fdee9db8ae9f12fd9cf8a3cc904867680 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

« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »