Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.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
Index: scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json
diff --git a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json
index b0a2f2b01f0c0756a606110418d219b350a32291..10e7fe87e78ec54cdac4942acd04f378c75600be 100644
--- a/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json
+++ b/scripts/slave/recipes/skia/swarm_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android.json
@@ -171,9 +171,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",

Powered by Google App Engine
This is Rietveld 408576698