SkQP: relax five more tests
am: ee8f507ede
Change-Id: I480b6dc0c8b51f4837c25c7bfc87faf1024db9eb
diff --git a/Android.bp b/Android.bp
index a6a29d6..909d01c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,7 +5,6 @@
sdk_version: "26",
stl: "libc++_static",
compile_multilib: "both",
- tags: ["tests", "optional"],
cflags: [
"-U_FORTIFY_SOURCE",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
index 9fae7c2..9e04af2 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -390,6 +400,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -408,6 +419,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -426,6 +438,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -478,6 +491,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -523,6 +537,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -542,6 +557,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -560,6 +576,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -578,6 +595,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -630,6 +648,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -647,6 +666,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -678,6 +698,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -694,6 +715,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -736,6 +758,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -786,6 +809,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
index 7fbe992..44d7556 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -390,6 +400,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -408,6 +419,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -426,6 +438,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -478,6 +491,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -523,6 +537,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -542,6 +557,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -560,6 +576,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -578,6 +595,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -630,6 +648,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1039,6 +1058,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1070,6 +1090,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1086,6 +1107,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1128,6 +1150,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1178,6 +1201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json
index a583f12..cb574b9 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-All-Android.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -390,6 +400,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -408,6 +419,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -426,6 +438,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -478,6 +491,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -523,6 +537,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -542,6 +557,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -560,6 +576,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -578,6 +595,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -630,6 +648,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -887,6 +906,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -918,6 +938,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -934,6 +955,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -976,6 +998,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1026,6 +1049,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
index 4fd500c..e9240ae 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -390,6 +400,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -408,6 +419,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -426,6 +438,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -478,6 +491,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -523,6 +537,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -542,6 +557,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -560,6 +576,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -578,6 +595,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -630,6 +648,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -871,6 +890,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -902,6 +922,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -918,6 +939,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -960,6 +982,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1010,6 +1033,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
index df8950f..03545fa 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -390,6 +400,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -408,6 +419,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -426,6 +438,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -478,6 +491,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -523,6 +537,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -542,6 +557,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -560,6 +576,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -578,6 +595,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -630,6 +648,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -691,6 +710,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -722,6 +742,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -738,6 +759,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -780,6 +802,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -830,6 +853,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
index d27bbe5..61641b4 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -390,6 +400,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -408,6 +419,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -426,6 +438,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -478,6 +491,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -523,6 +537,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -542,6 +557,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -560,6 +576,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -578,6 +595,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -630,6 +648,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -647,6 +666,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -678,6 +698,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -694,6 +715,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -736,6 +758,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -786,6 +809,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
index 01efa4f..13ff534 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -390,6 +400,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -408,6 +419,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -426,6 +438,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -478,6 +491,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -523,6 +537,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -542,6 +557,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -560,6 +576,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -578,6 +595,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -630,6 +648,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -943,6 +962,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -974,6 +994,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -990,6 +1011,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1032,6 +1054,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1082,6 +1105,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
index bf48018..7f0ed7c 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -151,7 +155,7 @@
"cmd": [
"python",
"-u",
- "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nASAN_SETUP = sys.argv[2]\n\ndef wait_for_device():\n while True:\n time.sleep(5)\n print 'Waiting for device'\n subprocess.check_output([ADB, 'wait-for-device'])\n bit1 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'dev.bootcomplete'])\n bit2 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'sys.boot_completed'])\n if '1' in bit1 and '1' in bit2:\n print 'Device detected'\n break\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\noutput = subprocess.check_output([ADB, 'disable-verity'])\nprint output\n\nif 'already disabled' not in output:\n print 'Rebooting device'\n subprocess.check_output([ADB, 'reboot'])\n wait_for_device()\n\n# ASAN setup script is idempotent, either it installs it or says it's installed\noutput = subprocess.check_output([ADB, 'wait-for-device'])\nprocess = subprocess.Popen([ASAN_SETUP], env={'ADB': ADB},\n stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n\n# this also blocks until command finishes\n(stdout, stderr) = process.communicate()\nprint stdout\nprint 'Stderr: %s' % stderr\nif process.returncode:\n raise Exception('setup ASAN returned with non-zero exit code: %d' %\n process.returncode)\n\nif 'Please wait until the device restarts' in stdout:\n # Sleep because device does not reboot instantly\n time.sleep(30)\nwait_for_device()\n",
+ "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nASAN_SETUP = sys.argv[2]\n\ndef wait_for_device():\n while True:\n time.sleep(5)\n print 'Waiting for device'\n subprocess.check_output([ADB, 'wait-for-device'])\n bit1 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'dev.bootcomplete'])\n bit2 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'sys.boot_completed'])\n if '1' in bit1 and '1' in bit2:\n print 'Device detected'\n break\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\noutput = subprocess.check_output([ADB, 'disable-verity'])\nprint output\n\nif 'already disabled' not in output:\n print 'Rebooting device'\n subprocess.check_output([ADB, 'reboot'])\n wait_for_device()\n\ndef installASAN(revert=False):\n # ASAN setup script is idempotent, either it installs it or\n # says it's installed. Returns True on success, false otherwise.\n out = subprocess.check_output([ADB, 'wait-for-device'])\n print out\n cmd = [ASAN_SETUP]\n if revert:\n cmd = [ASAN_SETUP, '--revert']\n process = subprocess.Popen(cmd, env={'ADB': ADB},\n stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n\n # this also blocks until command finishes\n (stdout, stderr) = process.communicate()\n print stdout\n print 'Stderr: %s' % stderr\n return process.returncode == 0\n\nif not installASAN():\n print 'Trying to revert the ASAN install and then re-install'\n # ASAN script sometimes has issues if it was interrupted or partially applied\n # Try reverting it, then re-enabling it\n if not installASAN(revert=True):\n raise Exception('reverting ASAN install failed')\n\n # Sleep because device does not reboot instantly\n time.sleep(10)\n\n if not installASAN():\n raise Exception('Tried twice to setup ASAN and failed.')\n\n# Sleep because device does not reboot instantly\ntime.sleep(10)\nwait_for_device()\n",
"/opt/infra-android/tools/adb",
"[START_DIR]/android_ndk_linux/toolchains/llvm/prebuilt/linux-x86_64/bin/asan_device_setup"
],
@@ -200,22 +204,38 @@
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'reboot'])@@@",
"@@@STEP_LOG_LINE@python.inline@ wait_for_device()@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@# ASAN setup script is idempotent, either it installs it or says it's installed@@@",
- "@@@STEP_LOG_LINE@python.inline@output = subprocess.check_output([ADB, 'wait-for-device'])@@@",
- "@@@STEP_LOG_LINE@python.inline@process = subprocess.Popen([ASAN_SETUP], env={'ADB': ADB},@@@",
- "@@@STEP_LOG_LINE@python.inline@ stdout=subprocess.PIPE, stderr=subprocess.PIPE)@@@",
+ "@@@STEP_LOG_LINE@python.inline@def installASAN(revert=False):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # ASAN setup script is idempotent, either it installs it or@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # says it's installed. Returns True on success, false otherwise.@@@",
+ "@@@STEP_LOG_LINE@python.inline@ out = subprocess.check_output([ADB, 'wait-for-device'])@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print out@@@",
+ "@@@STEP_LOG_LINE@python.inline@ cmd = [ASAN_SETUP]@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if revert:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ cmd = [ASAN_SETUP, '--revert']@@@",
+ "@@@STEP_LOG_LINE@python.inline@ process = subprocess.Popen(cmd, env={'ADB': ADB},@@@",
+ "@@@STEP_LOG_LINE@python.inline@ stdout=subprocess.PIPE, stderr=subprocess.PIPE)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@# this also blocks until command finishes@@@",
- "@@@STEP_LOG_LINE@python.inline@(stdout, stderr) = process.communicate()@@@",
- "@@@STEP_LOG_LINE@python.inline@print stdout@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Stderr: %s' % stderr@@@",
- "@@@STEP_LOG_LINE@python.inline@if process.returncode:@@@",
- "@@@STEP_LOG_LINE@python.inline@ raise Exception('setup ASAN returned with non-zero exit code: %d' %@@@",
- "@@@STEP_LOG_LINE@python.inline@ process.returncode)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # this also blocks until command finishes@@@",
+ "@@@STEP_LOG_LINE@python.inline@ (stdout, stderr) = process.communicate()@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print stdout@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Stderr: %s' % stderr@@@",
+ "@@@STEP_LOG_LINE@python.inline@ return process.returncode == 0@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if 'Please wait until the device restarts' in stdout:@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not installASAN():@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Trying to revert the ASAN install and then re-install'@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # ASAN script sometimes has issues if it was interrupted or partially applied@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # Try reverting it, then re-enabling it@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if not installASAN(revert=True):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ raise Exception('reverting ASAN install failed')@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@ # Sleep because device does not reboot instantly@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(30)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ time.sleep(10)@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if not installASAN():@@@",
+ "@@@STEP_LOG_LINE@python.inline@ raise Exception('Tried twice to setup ASAN and failed.')@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@# Sleep because device does not reboot instantly@@@",
+ "@@@STEP_LOG_LINE@python.inline@time.sleep(10)@@@",
"@@@STEP_LOG_LINE@python.inline@wait_for_device()@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
@@ -292,6 +312,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -311,6 +332,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -329,6 +351,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -347,6 +370,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -399,6 +423,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -444,6 +469,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -463,6 +489,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -481,6 +508,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -499,6 +527,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -551,6 +580,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -596,6 +626,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -615,6 +646,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -633,6 +665,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -651,6 +684,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -703,6 +737,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1016,6 +1051,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1047,6 +1083,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1063,6 +1100,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1105,6 +1143,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1155,6 +1194,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
index a5ec0b8..cd335a4 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -390,6 +400,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -408,6 +419,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -426,6 +438,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -478,6 +491,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -523,6 +537,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -542,6 +557,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -560,6 +576,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -578,6 +595,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -630,6 +648,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -691,6 +710,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -722,6 +742,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -738,6 +759,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -780,6 +802,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -830,6 +853,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
index e9c7be9..14e2517 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -390,6 +400,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -408,6 +419,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -426,6 +438,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -478,6 +491,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -523,6 +537,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -542,6 +557,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -560,6 +576,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -578,6 +595,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -630,6 +648,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -839,6 +858,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -870,6 +890,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -886,6 +907,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -928,6 +950,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -978,6 +1001,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
index 592125e..0d472ac 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -390,6 +400,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -408,6 +419,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -426,6 +438,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -478,6 +491,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -523,6 +537,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -542,6 +557,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -560,6 +576,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -578,6 +595,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -630,6 +648,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -965,6 +984,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -996,6 +1016,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1012,6 +1033,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1054,6 +1076,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1104,6 +1127,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
index 9ef5350..30cc85f 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -390,6 +400,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -408,6 +419,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -426,6 +438,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -478,6 +491,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -523,6 +537,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -542,6 +557,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -560,6 +576,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -578,6 +595,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -630,6 +648,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -887,6 +906,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -918,6 +938,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -934,6 +955,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -976,6 +998,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1042,6 +1065,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
index d091841..5e43885 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -219,6 +223,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -238,6 +243,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -256,6 +262,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -274,6 +281,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -326,6 +334,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -371,6 +380,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -391,6 +401,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -407,6 +418,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -425,6 +437,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -444,6 +457,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -462,6 +476,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -480,6 +495,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -532,6 +548,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -577,6 +594,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -596,6 +614,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -614,6 +633,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -632,6 +652,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -684,6 +705,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -941,6 +963,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -972,6 +995,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -988,6 +1012,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1030,6 +1055,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1080,6 +1106,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
index 9e010c6..b3b6503 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -158,6 +162,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -174,6 +179,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -193,6 +199,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -273,6 +280,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -292,6 +300,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -310,6 +319,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -328,6 +338,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -380,6 +391,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -425,6 +437,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -444,6 +457,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -462,6 +476,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -480,6 +495,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -532,6 +548,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -577,6 +594,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -596,6 +614,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -614,6 +633,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -632,6 +652,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -684,6 +705,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -941,6 +963,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -972,6 +995,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -988,6 +1012,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1030,6 +1055,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1080,6 +1106,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
index 0113312..e87a46f 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
@@ -57,6 +57,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -103,6 +104,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -121,6 +123,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -139,6 +142,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -158,6 +162,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -174,6 +179,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -193,6 +199,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -212,6 +219,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -228,6 +236,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -247,6 +256,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -315,6 +325,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
index c341857..25a3e6c 100644
--- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
@@ -15,9 +15,12 @@
super(GNAndroidFlavorUtils, self).__init__(m)
self._ever_ran_adb = False
self.ADB_BINARY = '/usr/bin/adb.1.0.35'
+ self.ADB_PUB_KEY = '/home/chrome-bot/.android/adbkey'
self._golo_devices = ['Nexus5x']
if self.m.vars.builder_cfg.get('model') in self._golo_devices:
self.ADB_BINARY = '/opt/infra-android/tools/adb'
+ self.ADB_PUB_KEY = ('/home/chrome-bot/.android/'
+ 'chrome_infrastructure_adbkey')
self.device_dirs = default_flavor.DeviceDirs(
dm_dir = self.m.vars.android_data_dir + 'dm_out',
@@ -102,10 +105,11 @@
fail_build_on_failure=False)
with self.m.context(cwd=self.m.vars.skia_dir):
- return self.m.run.with_retry(self.m.step, title, attempts,
- cmd=[self.ADB_BINARY]+list(cmd),
- between_attempts_fn=wait_for_device,
- **kwargs)
+ with self.m.env({'ADB_VENDOR_KEYS': self.ADB_PUB_KEY}):
+ return self.m.run.with_retry(self.m.step, title, attempts,
+ cmd=[self.ADB_BINARY]+list(cmd),
+ between_attempts_fn=wait_for_device,
+ **kwargs)
def _scale_for_dm(self):
device = self.m.vars.builder_cfg.get('model')
@@ -458,22 +462,38 @@
subprocess.check_output([ADB, 'reboot'])
wait_for_device()
-# ASAN setup script is idempotent, either it installs it or says it's installed
-output = subprocess.check_output([ADB, 'wait-for-device'])
-process = subprocess.Popen([ASAN_SETUP], env={'ADB': ADB},
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+def installASAN(revert=False):
+ # ASAN setup script is idempotent, either it installs it or
+ # says it's installed. Returns True on success, false otherwise.
+ out = subprocess.check_output([ADB, 'wait-for-device'])
+ print out
+ cmd = [ASAN_SETUP]
+ if revert:
+ cmd = [ASAN_SETUP, '--revert']
+ process = subprocess.Popen(cmd, env={'ADB': ADB},
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-# this also blocks until command finishes
-(stdout, stderr) = process.communicate()
-print stdout
-print 'Stderr: %s' % stderr
-if process.returncode:
- raise Exception('setup ASAN returned with non-zero exit code: %d' %
- process.returncode)
+ # this also blocks until command finishes
+ (stdout, stderr) = process.communicate()
+ print stdout
+ print 'Stderr: %s' % stderr
+ return process.returncode == 0
-if 'Please wait until the device restarts' in stdout:
+if not installASAN():
+ print 'Trying to revert the ASAN install and then re-install'
+ # ASAN script sometimes has issues if it was interrupted or partially applied
+ # Try reverting it, then re-enabling it
+ if not installASAN(revert=True):
+ raise Exception('reverting ASAN install failed')
+
# Sleep because device does not reboot instantly
- time.sleep(30)
+ time.sleep(10)
+
+ if not installASAN():
+ raise Exception('Tried twice to setup ASAN and failed.')
+
+# Sleep because device does not reboot instantly
+time.sleep(10)
wait_for_device()
""",
args = [self.ADB_BINARY, asan_setup],
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json
index 06cb275..260069c 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_Vulkan.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -545,6 +561,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -582,6 +599,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -598,6 +616,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -679,6 +698,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json
index 61cae08..ab05ab6 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -729,6 +745,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -766,6 +783,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -782,6 +800,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -863,6 +882,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json
index 20ec4a0..d0a9dba 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -973,6 +991,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1010,6 +1029,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1026,6 +1046,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1089,6 +1110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1139,6 +1161,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
index 6ee0ce1..1751b0e 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -701,6 +719,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -738,6 +757,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -754,6 +774,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -817,6 +838,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -867,6 +889,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json
index 5ec1e27..3f9972f 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -701,6 +719,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -738,6 +757,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -754,6 +774,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -817,6 +838,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -867,6 +889,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json
index bd588a0..298a31d 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -821,6 +839,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -858,6 +877,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -874,6 +894,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -937,6 +958,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -987,6 +1009,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
index 7962b2b..5836f7a 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -821,6 +839,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -858,6 +877,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -874,6 +894,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -937,6 +958,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -987,6 +1009,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
index fcba342..b64a8b4 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -805,6 +823,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -842,6 +861,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -858,6 +878,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -921,6 +942,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -971,6 +993,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/perf.expected/cpu_scale_failed.json b/infra/bots/recipes/perf.expected/cpu_scale_failed.json
index 4f88b37..e16035d 100644
--- a/infra/bots/recipes/perf.expected/cpu_scale_failed.json
+++ b/infra/bots/recipes/perf.expected/cpu_scale_failed.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -870,6 +886,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json b/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json
index 94144a6..6e5e679 100644
--- a/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json
+++ b/infra/bots/recipes/perf.expected/cpu_scale_failed_golo.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -874,6 +892,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -938,6 +957,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json b/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json
index 14d842e..af6345a 100644
--- a/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json
+++ b/infra/bots/recipes/perf.expected/cpu_scale_failed_once.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -863,6 +879,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -900,6 +917,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -916,6 +934,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -997,6 +1016,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/perf.expected/failed_push.json b/infra/bots/recipes/perf.expected/failed_push.json
index a1d5942..63ceffc 100644
--- a/infra/bots/recipes/perf.expected/failed_push.json
+++ b/infra/bots/recipes/perf.expected/failed_push.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -110,6 +111,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json
index f2f6276..574d491 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json
@@ -24,6 +24,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -69,6 +70,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -88,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -106,6 +109,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -124,6 +128,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -176,6 +181,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -355,6 +361,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
index 6ebd68c..0451431 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench.json
@@ -24,6 +24,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -69,6 +70,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -88,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -106,6 +109,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -124,6 +128,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -176,6 +181,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -351,6 +357,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json
index 26a41c2..3e356e7 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench.json
@@ -24,6 +24,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -69,6 +70,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -88,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -106,6 +109,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -124,6 +128,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -176,6 +181,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -351,6 +357,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json
index 7b7275d..15453d6 100644
--- a/infra/bots/recipes/skpbench.expected/trybot.json
+++ b/infra/bots/recipes/skpbench.expected/trybot.json
@@ -24,6 +24,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -69,6 +70,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -88,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -106,6 +109,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -124,6 +128,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -176,6 +181,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -357,6 +363,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
index a5c9ab5..daa7b21 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -706,6 +725,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -743,6 +763,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -759,6 +780,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -807,6 +829,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -857,6 +880,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json
index 391fbe2..295f588 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -662,6 +681,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -699,6 +719,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -715,6 +736,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -763,6 +785,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -813,6 +836,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json
index 1411765..23c43c4 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -662,6 +681,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -699,6 +719,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -715,6 +736,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -763,6 +785,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -813,6 +836,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json
index 09ef5d8..cd29b96 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -662,6 +681,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -699,6 +719,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -715,6 +736,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -763,6 +785,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -813,6 +836,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json
index 7bcfd9f..46da471 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -662,6 +681,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -699,6 +719,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -715,6 +736,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -763,6 +785,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -813,6 +836,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json
index a1edd78..4d6a766 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -706,6 +725,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -743,6 +763,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -759,6 +780,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -807,6 +829,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -857,6 +880,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json
index ca13760..7815866 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm-Debug-All-Android_ASAN.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -21,7 +22,7 @@
"cmd": [
"python",
"-u",
- "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nASAN_SETUP = sys.argv[2]\n\ndef wait_for_device():\n while True:\n time.sleep(5)\n print 'Waiting for device'\n subprocess.check_output([ADB, 'wait-for-device'])\n bit1 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'dev.bootcomplete'])\n bit2 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'sys.boot_completed'])\n if '1' in bit1 and '1' in bit2:\n print 'Device detected'\n break\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\noutput = subprocess.check_output([ADB, 'disable-verity'])\nprint output\n\nif 'already disabled' not in output:\n print 'Rebooting device'\n subprocess.check_output([ADB, 'reboot'])\n wait_for_device()\n\n# ASAN setup script is idempotent, either it installs it or says it's installed\noutput = subprocess.check_output([ADB, 'wait-for-device'])\nprocess = subprocess.Popen([ASAN_SETUP], env={'ADB': ADB},\n stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n\n# this also blocks until command finishes\n(stdout, stderr) = process.communicate()\nprint stdout\nprint 'Stderr: %s' % stderr\nif process.returncode:\n raise Exception('setup ASAN returned with non-zero exit code: %d' %\n process.returncode)\n\nif 'Please wait until the device restarts' in stdout:\n # Sleep because device does not reboot instantly\n time.sleep(30)\nwait_for_device()\n",
+ "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nASAN_SETUP = sys.argv[2]\n\ndef wait_for_device():\n while True:\n time.sleep(5)\n print 'Waiting for device'\n subprocess.check_output([ADB, 'wait-for-device'])\n bit1 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'dev.bootcomplete'])\n bit2 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'sys.boot_completed'])\n if '1' in bit1 and '1' in bit2:\n print 'Device detected'\n break\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\noutput = subprocess.check_output([ADB, 'disable-verity'])\nprint output\n\nif 'already disabled' not in output:\n print 'Rebooting device'\n subprocess.check_output([ADB, 'reboot'])\n wait_for_device()\n\ndef installASAN(revert=False):\n # ASAN setup script is idempotent, either it installs it or\n # says it's installed. Returns True on success, false otherwise.\n out = subprocess.check_output([ADB, 'wait-for-device'])\n print out\n cmd = [ASAN_SETUP]\n if revert:\n cmd = [ASAN_SETUP, '--revert']\n process = subprocess.Popen(cmd, env={'ADB': ADB},\n stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n\n # this also blocks until command finishes\n (stdout, stderr) = process.communicate()\n print stdout\n print 'Stderr: %s' % stderr\n return process.returncode == 0\n\nif not installASAN():\n print 'Trying to revert the ASAN install and then re-install'\n # ASAN script sometimes has issues if it was interrupted or partially applied\n # Try reverting it, then re-enabling it\n if not installASAN(revert=True):\n raise Exception('reverting ASAN install failed')\n\n # Sleep because device does not reboot instantly\n time.sleep(10)\n\n if not installASAN():\n raise Exception('Tried twice to setup ASAN and failed.')\n\n# Sleep because device does not reboot instantly\ntime.sleep(10)\nwait_for_device()\n",
"/opt/infra-android/tools/adb",
"[START_DIR]/android_ndk_linux/toolchains/llvm/prebuilt/linux-x86_64/bin/asan_device_setup"
],
@@ -70,22 +71,38 @@
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'reboot'])@@@",
"@@@STEP_LOG_LINE@python.inline@ wait_for_device()@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@# ASAN setup script is idempotent, either it installs it or says it's installed@@@",
- "@@@STEP_LOG_LINE@python.inline@output = subprocess.check_output([ADB, 'wait-for-device'])@@@",
- "@@@STEP_LOG_LINE@python.inline@process = subprocess.Popen([ASAN_SETUP], env={'ADB': ADB},@@@",
- "@@@STEP_LOG_LINE@python.inline@ stdout=subprocess.PIPE, stderr=subprocess.PIPE)@@@",
+ "@@@STEP_LOG_LINE@python.inline@def installASAN(revert=False):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # ASAN setup script is idempotent, either it installs it or@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # says it's installed. Returns True on success, false otherwise.@@@",
+ "@@@STEP_LOG_LINE@python.inline@ out = subprocess.check_output([ADB, 'wait-for-device'])@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print out@@@",
+ "@@@STEP_LOG_LINE@python.inline@ cmd = [ASAN_SETUP]@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if revert:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ cmd = [ASAN_SETUP, '--revert']@@@",
+ "@@@STEP_LOG_LINE@python.inline@ process = subprocess.Popen(cmd, env={'ADB': ADB},@@@",
+ "@@@STEP_LOG_LINE@python.inline@ stdout=subprocess.PIPE, stderr=subprocess.PIPE)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@# this also blocks until command finishes@@@",
- "@@@STEP_LOG_LINE@python.inline@(stdout, stderr) = process.communicate()@@@",
- "@@@STEP_LOG_LINE@python.inline@print stdout@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Stderr: %s' % stderr@@@",
- "@@@STEP_LOG_LINE@python.inline@if process.returncode:@@@",
- "@@@STEP_LOG_LINE@python.inline@ raise Exception('setup ASAN returned with non-zero exit code: %d' %@@@",
- "@@@STEP_LOG_LINE@python.inline@ process.returncode)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # this also blocks until command finishes@@@",
+ "@@@STEP_LOG_LINE@python.inline@ (stdout, stderr) = process.communicate()@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print stdout@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Stderr: %s' % stderr@@@",
+ "@@@STEP_LOG_LINE@python.inline@ return process.returncode == 0@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if 'Please wait until the device restarts' in stdout:@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not installASAN():@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Trying to revert the ASAN install and then re-install'@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # ASAN script sometimes has issues if it was interrupted or partially applied@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # Try reverting it, then re-enabling it@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if not installASAN(revert=True):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ raise Exception('reverting ASAN install failed')@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@ # Sleep because device does not reboot instantly@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(30)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ time.sleep(10)@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if not installASAN():@@@",
+ "@@@STEP_LOG_LINE@python.inline@ raise Exception('Tried twice to setup ASAN and failed.')@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@# Sleep because device does not reboot instantly@@@",
+ "@@@STEP_LOG_LINE@python.inline@time.sleep(10)@@@",
"@@@STEP_LOG_LINE@python.inline@wait_for_device()@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
@@ -162,6 +179,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -181,6 +199,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -199,6 +218,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -217,6 +237,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -269,6 +290,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -314,6 +336,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -333,6 +356,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -351,6 +375,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -369,6 +394,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -421,6 +447,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -466,6 +493,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -485,6 +513,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -503,6 +532,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -521,6 +551,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -573,6 +604,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -914,6 +946,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -951,6 +984,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -967,6 +1001,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1048,6 +1083,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json
index 851253d..ecb57a7 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_ASAN.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -21,7 +22,7 @@
"cmd": [
"python",
"-u",
- "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nASAN_SETUP = sys.argv[2]\n\ndef wait_for_device():\n while True:\n time.sleep(5)\n print 'Waiting for device'\n subprocess.check_output([ADB, 'wait-for-device'])\n bit1 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'dev.bootcomplete'])\n bit2 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'sys.boot_completed'])\n if '1' in bit1 and '1' in bit2:\n print 'Device detected'\n break\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\noutput = subprocess.check_output([ADB, 'disable-verity'])\nprint output\n\nif 'already disabled' not in output:\n print 'Rebooting device'\n subprocess.check_output([ADB, 'reboot'])\n wait_for_device()\n\n# ASAN setup script is idempotent, either it installs it or says it's installed\noutput = subprocess.check_output([ADB, 'wait-for-device'])\nprocess = subprocess.Popen([ASAN_SETUP], env={'ADB': ADB},\n stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n\n# this also blocks until command finishes\n(stdout, stderr) = process.communicate()\nprint stdout\nprint 'Stderr: %s' % stderr\nif process.returncode:\n raise Exception('setup ASAN returned with non-zero exit code: %d' %\n process.returncode)\n\nif 'Please wait until the device restarts' in stdout:\n # Sleep because device does not reboot instantly\n time.sleep(30)\nwait_for_device()\n",
+ "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nASAN_SETUP = sys.argv[2]\n\ndef wait_for_device():\n while True:\n time.sleep(5)\n print 'Waiting for device'\n subprocess.check_output([ADB, 'wait-for-device'])\n bit1 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'dev.bootcomplete'])\n bit2 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'sys.boot_completed'])\n if '1' in bit1 and '1' in bit2:\n print 'Device detected'\n break\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\noutput = subprocess.check_output([ADB, 'disable-verity'])\nprint output\n\nif 'already disabled' not in output:\n print 'Rebooting device'\n subprocess.check_output([ADB, 'reboot'])\n wait_for_device()\n\ndef installASAN(revert=False):\n # ASAN setup script is idempotent, either it installs it or\n # says it's installed. Returns True on success, false otherwise.\n out = subprocess.check_output([ADB, 'wait-for-device'])\n print out\n cmd = [ASAN_SETUP]\n if revert:\n cmd = [ASAN_SETUP, '--revert']\n process = subprocess.Popen(cmd, env={'ADB': ADB},\n stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n\n # this also blocks until command finishes\n (stdout, stderr) = process.communicate()\n print stdout\n print 'Stderr: %s' % stderr\n return process.returncode == 0\n\nif not installASAN():\n print 'Trying to revert the ASAN install and then re-install'\n # ASAN script sometimes has issues if it was interrupted or partially applied\n # Try reverting it, then re-enabling it\n if not installASAN(revert=True):\n raise Exception('reverting ASAN install failed')\n\n # Sleep because device does not reboot instantly\n time.sleep(10)\n\n if not installASAN():\n raise Exception('Tried twice to setup ASAN and failed.')\n\n# Sleep because device does not reboot instantly\ntime.sleep(10)\nwait_for_device()\n",
"/opt/infra-android/tools/adb",
"[START_DIR]/android_ndk_linux/toolchains/llvm/prebuilt/linux-x86_64/bin/asan_device_setup"
],
@@ -70,22 +71,38 @@
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'reboot'])@@@",
"@@@STEP_LOG_LINE@python.inline@ wait_for_device()@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@# ASAN setup script is idempotent, either it installs it or says it's installed@@@",
- "@@@STEP_LOG_LINE@python.inline@output = subprocess.check_output([ADB, 'wait-for-device'])@@@",
- "@@@STEP_LOG_LINE@python.inline@process = subprocess.Popen([ASAN_SETUP], env={'ADB': ADB},@@@",
- "@@@STEP_LOG_LINE@python.inline@ stdout=subprocess.PIPE, stderr=subprocess.PIPE)@@@",
+ "@@@STEP_LOG_LINE@python.inline@def installASAN(revert=False):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # ASAN setup script is idempotent, either it installs it or@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # says it's installed. Returns True on success, false otherwise.@@@",
+ "@@@STEP_LOG_LINE@python.inline@ out = subprocess.check_output([ADB, 'wait-for-device'])@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print out@@@",
+ "@@@STEP_LOG_LINE@python.inline@ cmd = [ASAN_SETUP]@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if revert:@@@",
+ "@@@STEP_LOG_LINE@python.inline@ cmd = [ASAN_SETUP, '--revert']@@@",
+ "@@@STEP_LOG_LINE@python.inline@ process = subprocess.Popen(cmd, env={'ADB': ADB},@@@",
+ "@@@STEP_LOG_LINE@python.inline@ stdout=subprocess.PIPE, stderr=subprocess.PIPE)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@# this also blocks until command finishes@@@",
- "@@@STEP_LOG_LINE@python.inline@(stdout, stderr) = process.communicate()@@@",
- "@@@STEP_LOG_LINE@python.inline@print stdout@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Stderr: %s' % stderr@@@",
- "@@@STEP_LOG_LINE@python.inline@if process.returncode:@@@",
- "@@@STEP_LOG_LINE@python.inline@ raise Exception('setup ASAN returned with non-zero exit code: %d' %@@@",
- "@@@STEP_LOG_LINE@python.inline@ process.returncode)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # this also blocks until command finishes@@@",
+ "@@@STEP_LOG_LINE@python.inline@ (stdout, stderr) = process.communicate()@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print stdout@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Stderr: %s' % stderr@@@",
+ "@@@STEP_LOG_LINE@python.inline@ return process.returncode == 0@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@if 'Please wait until the device restarts' in stdout:@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not installASAN():@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print 'Trying to revert the ASAN install and then re-install'@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # ASAN script sometimes has issues if it was interrupted or partially applied@@@",
+ "@@@STEP_LOG_LINE@python.inline@ # Try reverting it, then re-enabling it@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if not installASAN(revert=True):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ raise Exception('reverting ASAN install failed')@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@ # Sleep because device does not reboot instantly@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(30)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ time.sleep(10)@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if not installASAN():@@@",
+ "@@@STEP_LOG_LINE@python.inline@ raise Exception('Tried twice to setup ASAN and failed.')@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@# Sleep because device does not reboot instantly@@@",
+ "@@@STEP_LOG_LINE@python.inline@time.sleep(10)@@@",
"@@@STEP_LOG_LINE@python.inline@wait_for_device()@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
@@ -162,6 +179,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -181,6 +199,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -199,6 +218,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -217,6 +237,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -269,6 +290,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -314,6 +336,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -333,6 +356,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -351,6 +375,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -369,6 +394,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -421,6 +447,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -466,6 +493,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -485,6 +513,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -503,6 +532,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -521,6 +551,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -573,6 +604,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -914,6 +946,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -951,6 +984,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -967,6 +1001,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1048,6 +1083,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json
index 50d8fd6..6a1fedb 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android_NoGPUThreads.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -958,6 +977,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -995,6 +1015,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1011,6 +1032,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1059,6 +1081,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1109,6 +1132,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
index d8a1d69..3b9b6e5 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-CPU-Tegra3-arm-Release-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -706,6 +725,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -743,6 +763,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -759,6 +780,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -807,6 +829,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -857,6 +880,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json
index debb8b4..463f04b 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -706,6 +725,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -743,6 +763,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -759,6 +780,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -807,6 +829,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -857,6 +880,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json
index 3470851..35beb1b 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-Moorefield-x86-Release-All-Android.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -750,6 +769,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -787,6 +807,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -803,6 +824,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -851,6 +873,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -901,6 +924,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
index 358efb1..af6a913 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-All-Android_Vulkan.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -750,6 +769,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -787,6 +807,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -803,6 +824,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -851,6 +873,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -901,6 +924,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json
index 6c1bc58..6ca8d8c 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_CCPR.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -854,6 +873,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -891,6 +911,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -907,6 +928,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -955,6 +977,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1005,6 +1028,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json
index 4be7c95..9ed0b7f 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm64-Debug-All-Android_Vulkan.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -854,6 +873,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -891,6 +911,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -907,6 +928,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -955,6 +977,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -1005,6 +1028,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/failed_get_hashes.json b/infra/bots/recipes/test.expected/failed_get_hashes.json
index ee18434..dee94e9 100644
--- a/infra/bots/recipes/test.expected/failed_get_hashes.json
+++ b/infra/bots/recipes/test.expected/failed_get_hashes.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -619,6 +637,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -708,6 +727,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -745,6 +765,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -761,6 +782,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -809,6 +831,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -859,6 +882,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json
index d05d145..af65ac8 100644
--- a/infra/bots/recipes/test.expected/failed_pull.json
+++ b/infra/bots/recipes/test.expected/failed_pull.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -706,6 +725,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -743,6 +763,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -759,6 +780,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -809,6 +831,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -863,6 +886,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/failed_push.json b/infra/bots/recipes/test.expected/failed_push.json
index a1d5942..63ceffc 100644
--- a/infra/bots/recipes/test.expected/failed_push.json
+++ b/infra/bots/recipes/test.expected/failed_push.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -110,6 +111,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/internal_bot_1.json b/infra/bots/recipes/test.expected/internal_bot_1.json
index d176c41..ddd750c 100644
--- a/infra/bots/recipes/test.expected/internal_bot_1.json
+++ b/infra/bots/recipes/test.expected/internal_bot_1.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -662,6 +681,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -699,6 +719,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -715,6 +736,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -763,6 +785,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -813,6 +836,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/infra/bots/recipes/test.expected/internal_bot_2.json b/infra/bots/recipes/test.expected/internal_bot_2.json
index 1ca8d4d..322e514 100644
--- a/infra/bots/recipes/test.expected/internal_bot_2.json
+++ b/infra/bots/recipes/test.expected/internal_bot_2.json
@@ -9,6 +9,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -89,6 +90,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -108,6 +110,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -126,6 +129,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -144,6 +148,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -196,6 +201,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -241,6 +247,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -260,6 +267,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -278,6 +286,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -296,6 +305,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -348,6 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -393,6 +404,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -412,6 +424,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -430,6 +443,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -448,6 +462,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -500,6 +515,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -518,6 +534,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -536,6 +553,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -617,6 +635,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -662,6 +681,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -699,6 +719,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -715,6 +736,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -763,6 +785,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
@@ -813,6 +836,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/max.png
deleted file mode 100644
index 4fe036a..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/max.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/min.png
deleted file mode 100644
index c9753e3..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/min.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/max.png
deleted file mode 100644
index b05340f..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/max.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/min.png
deleted file mode 100644
index 9e4ca26..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/min.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/max.png
deleted file mode 100644
index fe45807..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/max.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/min.png
deleted file mode 100644
index 19e4149..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/min.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/max.png
deleted file mode 100644
index f212f00..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/max.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/min.png
deleted file mode 100644
index d0d712b..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/min.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/max.png
deleted file mode 100644
index 130bb01..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/max.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/min.png
deleted file mode 100644
index 10a680b..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/min.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/max.png
deleted file mode 100644
index 651f023..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/max.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/min.png
deleted file mode 100644
index 2ec52c7..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/min.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/max.png
deleted file mode 100644
index 4423ab4..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/max.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/min.png
deleted file mode 100644
index 423c087..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/min.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/path-reverse/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/path-reverse/max.png
deleted file mode 100644
index 0740314..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/path-reverse/max.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/path-reverse/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/path-reverse/min.png
deleted file mode 100644
index 131609f..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/path-reverse/min.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/max.png
deleted file mode 100644
index fcda507..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/max.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/min.png
deleted file mode 100644
index 7468706..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/min.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/max.png
deleted file mode 100644
index 2e9b546..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/max.png
+++ /dev/null
Binary files differ
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/min.png
deleted file mode 100644
index f6b270c..0000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/min.png
+++ /dev/null
Binary files differ
