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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.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_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json ('k') | scripts/slave/recipes/skia/swarm_test.expected/download_and_push_skimage.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json
diff --git a/scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json b/scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json
index 214cc9dea78ca7d0f511c4cc1a4626613f3fdd6e..0a9c3bc6c269573fb6698f89f376a100e02f162a 100644
--- a/scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json
+++ b/scripts/slave/recipes/skia/swarm_test.expected/adb_in_path.json
@@ -59,8 +59,8 @@
"[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
],
"env": {
- "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+ "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+ "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -75,8 +75,8 @@
"[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
],
"env": {
- "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+ "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+ "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -137,8 +137,8 @@
"[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
],
"env": {
- "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+ "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+ "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -153,8 +153,8 @@
"[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
],
"env": {
- "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+ "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+ "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -170,8 +170,8 @@
"--verbose"
],
"env": {
- "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+ "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+ "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -252,8 +252,8 @@
"/storage/emulated/legacy/skiabot/skia_resources"
],
"env": {
- "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+ "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+ "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -559,8 +559,8 @@
"--dummy-flags"
],
"env": {
- "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+ "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+ "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -578,8 +578,8 @@
"[CUSTOM_[SWARM_OUT_DIR]]/dm"
],
"env": {
- "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+ "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+ "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -638,8 +638,8 @@
"[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
],
"env": {
- "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+ "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+ "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
@@ -654,8 +654,8 @@
"[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
],
"env": {
- "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
- "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+ "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+ "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
« scripts/slave/recipe_modules/skia/android_flavor.py ('K') | « scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json ('k') | scripts/slave/recipes/skia/swarm_test.expected/download_and_push_skimage.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698