scripts/slave/recipes/gpu/build_and_test.expected/mac_debug.json - Issue 59233015: Make gyp target_arch setting native to chromium/config.py

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: scripts/slave/recipes/gpu/build_and_test.expected/mac_debug.json

Issue 59233015: Make gyp target_arch setting native to chromium/config.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Fix mac/linux bitness. Defaults to 64bit in tests Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: scripts/slave/recipes/gpu/build_and_test.expected/mac_debug.json

diff --git a/scripts/slave/recipes/gpu/build_and_test.expected/mac_debug.json b/scripts/slave/recipes/gpu/build_and_test.expected/mac_debug.json

index 6ed44d365109627363c9eadecf0a661af06194c4..d53ea872f72203c100bf3c7cef17881cceec0a26 100644

--- a/scripts/slave/recipes/gpu/build_and_test.expected/mac_debug.json

+++ b/scripts/slave/recipes/gpu/build_and_test.expected/mac_debug.json

@@ -78,7 +78,7 @@

"runhooks"

"env": {

- "GYP_DEFINES": "clang=1 component=shared_library internal_gles2_conform_tests=1",

+ "GYP_DEFINES": "clang=1 component=shared_library internal_gles2_conform_tests=1 target_arch=x64",

Ken Russell (switch to Gerrit) 2013/11/14 23:14:38 Is this correct at this point? I thought the 64-bi

"GYP_GENERATORS": "ninja"

"name": "gclient runhooks"