scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json - Issue 2099713002: Download the Android SDK as a CIPD package

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/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json

Issue 2099713002: Download the Android SDK as a CIPD package (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@cipd_swarm

Patch Set: Rebase Created 4 years, 6 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

« scripts/slave/recipe_modules/skia/android_flavor.py ('K') | « scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json ('k') | scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json

diff --git a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json

index 6217e81f8d18be791bcbc03be2b73777148ea580..480b5f7b3eeada15277cd32a2f5ebdce82cc75b8 100644

--- a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json

+++ b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json

@@ -172,9 +172,9 @@

"cwd": "[CUSTOM_/_B_WORK]/skia",

"env": {

- "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",

+ "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",

"ANDROID_MAKE_CCACHE": "/usr/bin/ccache",

- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",

+ "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",

"BUILDTYPE": "Release",

"CHROME_HEADLESS": "1",

"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=1",