scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json - Issue 1237833003: Update slave scripts to set skia_arch_type but not skia_arch_width

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/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json

Issue 1237833003: Update slave scripts to set skia_arch_type but not skia_arch_width (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: rebase Created 5 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

« no previous file with comments | « scripts/slave/recipe_modules/skia/config.py ('k') | scripts/slave/recipes/skia/skia.expected/Build-Ubuntu-GCC-Arm7-Debug-Android_FrameworkDefs.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json

diff --git a/scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json b/scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json

index 7c14321c75f1900b9d7ccc82f277b3bd1ee5ae66..4153b1af9f7eadb9b7015139888b1ead2dcd86fb 100644

--- a/scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json

+++ b/scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json

@@ -94,7 +94,7 @@

"ANDROID_HOME": "/Users/chrome-bot/adt-bundle-mac-x86_64-20140702/sdk",

"ANDROID_SDK_ROOT": "/Users/chrome-bot/adt-bundle-mac-x86_64-20140702/sdk",

"BUILDTYPE": "Debug",

- "GYP_DEFINES": "skia_arch_type=arm skia_arch_width=32 skia_clang_build=1 skia_warnings_as_errors=0",

+ "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_warnings_as_errors=0",

"SKIA_ANDROID_VERBOSE_SETUP": "1",

"SKIA_OUT": "[SLAVE_BUILD]/skia/out/Build-Mac10.8-Clang-Arm7-Debug-Android"