Index: infra/bots/recipes/swarm_test.expected/adb_in_path.json |
diff --git a/infra/bots/recipes/swarm_test.expected/adb_in_path.json b/infra/bots/recipes/swarm_test.expected/adb_in_path.json |
index 29bc01d03ca45f82f1bfd1e4c87a31ebde69f4e3..422898de3ebd130d36e227cce69a1202e85a0845 100644 |
--- a/infra/bots/recipes/swarm_test.expected/adb_in_path.json |
+++ b/infra/bots/recipes/swarm_test.expected/adb_in_path.json |
@@ -16,7 +16,6 @@ |
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_ANDROID_VERBOSE_SETUP": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
@@ -31,7 +30,6 @@ |
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_ANDROID_VERBOSE_SETUP": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
@@ -47,7 +45,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "get EXTERNAL_STORAGE dir", |
@@ -61,7 +58,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "adb root", |
@@ -75,7 +71,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "wait" |
@@ -89,7 +84,6 @@ |
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_ANDROID_VERBOSE_SETUP": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
@@ -104,7 +98,6 @@ |
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_ANDROID_VERBOSE_SETUP": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
@@ -120,7 +113,6 @@ |
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_ANDROID_VERBOSE_SETUP": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
@@ -135,7 +127,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "stop shell" |
@@ -150,7 +141,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "starting battery stats" |
@@ -165,7 +155,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "cat scaling_governor" |
@@ -180,7 +169,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "cat cpu_freq" |
@@ -197,7 +185,6 @@ |
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_ANDROID_VERBOSE_SETUP": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
@@ -233,7 +220,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "read SKP_VERSION", |
@@ -269,7 +255,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "read SK_IMAGE_VERSION", |
@@ -330,7 +315,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "rmdir skia_dm" |
@@ -352,7 +336,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "exists skia_dm", |
@@ -369,7 +352,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "mkdir skia_dm" |
@@ -407,7 +389,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "get uninteresting hashes", |
@@ -455,7 +436,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "push uninteresting_hashes.txt" |
@@ -812,7 +792,6 @@ |
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_ANDROID_VERBOSE_SETUP": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
@@ -830,7 +809,6 @@ |
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_ANDROID_VERBOSE_SETUP": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
@@ -846,7 +824,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "final battery stats" |
@@ -859,7 +836,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "reboot" |
@@ -872,7 +848,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "wait for reboot" |
@@ -886,7 +861,6 @@ |
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_ANDROID_VERBOSE_SETUP": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
@@ -901,7 +875,6 @@ |
"ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_ANDROID_VERBOSE_SETUP": "1", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
@@ -915,7 +888,6 @@ |
"env": { |
"BUILDTYPE": "Debug", |
"CHROME_HEADLESS": "1", |
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", |
"SKIA_OUT": "[SLAVE_BUILD]/out" |
}, |
"name": "kill-server" |