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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.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_Vulkan.json ('k') | scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
diff --git a/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json b/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
index a9b3efd8dbdef3c596132f82f13bf779fb86c882..bbad46988830cafd6a5b1cd4a2a89a3d310945cc 100644
--- a/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
+++ b/scripts/slave/recipes/skia/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json
@@ -62,8 +62,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": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -78,8 +78,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": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -91,7 +91,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"echo",
"$EXTERNAL_STORAGE"
@@ -108,7 +108,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"root"
],
"env": {
@@ -140,8 +140,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": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -156,8 +156,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": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -173,8 +173,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": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -186,7 +186,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"stop"
],
@@ -201,7 +201,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"dumpsys",
"batteryproperties"
@@ -217,7 +217,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"
@@ -233,7 +233,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"
@@ -255,8 +255,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": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -278,7 +278,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"
@@ -305,7 +305,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"
@@ -322,7 +322,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"rm",
"-r",
@@ -339,7 +339,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"if",
"[",
@@ -363,7 +363,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"mkdir",
"-p",
@@ -419,8 +419,8 @@
"Android"
],
"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": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -460,8 +460,8 @@
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/data"
],
"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": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -473,7 +473,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"shell",
"dumpsys",
"batteryproperties"
@@ -489,7 +489,7 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
"reboot"
],
"env": {
@@ -520,8 +520,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": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -536,8 +536,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": "Release",
"CHROME_HEADLESS": "1",
"GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0",
@@ -549,7 +549,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_compile.expected/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan.json ('k') | scripts/slave/recipes/skia/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698