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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_test.expected/missing_SK_IMAGE_VERSION_device.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/missing_SKP_VERSION_device.json ('k') | scripts/slave/recipes/skia/swarm_trigger.py » ('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/missing_SK_IMAGE_VERSION_device.json
diff --git a/scripts/slave/recipes/skia/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json b/scripts/slave/recipes/skia/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
index 6151dfa04590a0a1d34fe0b80e8d8c703b899adb..402185eb2c3208e8759895f8f9f7aa822e853940 100644
--- a/scripts/slave/recipes/skia/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
+++ b/scripts/slave/recipes/skia/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json
@@ -63,8 +63,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",
@@ -79,8 +79,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",
@@ -92,7 +92,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"echo",
"$EXTERNAL_STORAGE"
@@ -109,7 +109,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"root"
],
"env": {
@@ -141,8 +141,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",
@@ -157,8 +157,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",
@@ -174,8 +174,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",
@@ -187,7 +187,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"stop"
],
@@ -202,7 +202,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"dumpsys",
"batteryproperties"
@@ -218,7 +218,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"cat",
"/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"
@@ -234,7 +234,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"cat",
"/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"
@@ -256,8 +256,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",
@@ -279,7 +279,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"cat",
"/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
@@ -306,7 +306,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"cat",
"/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
@@ -327,7 +327,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"rm",
"-f",
@@ -344,7 +344,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"rm",
"-r",
@@ -361,7 +361,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"if",
"[",
@@ -385,7 +385,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"mkdir",
"-p",
@@ -408,8 +408,8 @@
"/storage/emulated/legacy/skiabot/skia_images"
],
"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",
@@ -421,7 +421,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"push",
"[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
"/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
@@ -481,7 +481,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"rm",
"-r",
@@ -498,7 +498,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"if",
"[",
@@ -522,7 +522,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"mkdir",
"-p",
@@ -611,7 +611,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"push",
"[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
"/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt"
@@ -677,8 +677,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",
@@ -696,8 +696,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",
@@ -709,7 +709,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"dumpsys",
"batteryproperties"
@@ -725,7 +725,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"reboot"
],
"env": {
@@ -756,8 +756,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",
@@ -772,8 +772,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",
@@ -785,7 +785,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"kill-server"
],
"env": {
« scripts/slave/recipe_modules/skia/android_flavor.py ('K') | « scripts/slave/recipes/skia/swarm_test.expected/missing_SKP_VERSION_device.json ('k') | scripts/slave/recipes/skia/swarm_trigger.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698