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

Unified Diff: infra/bots/recipes/swarm_test.expected/download_and_push_skps.json

Issue 2209423002: [recipes] Remove build environment vars from default_env (Closed) Base URL: https://skia.googlesource.com/skia.git@merge_buildbot_spec_fix_coverage
Patch Set: [recipes] Remove build environment vars from default_env Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
index 60c0186a299d8b386b4f4cfaeb72278a446875a3..982eb7b5b3849fd4324ccc2ce5e4a9339a926d53 100644
--- a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
+++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json
@@ -20,7 +20,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"
},
@@ -35,7 +34,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"
},
@@ -51,7 +49,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",
@@ -65,7 +62,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",
@@ -79,7 +75,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"
@@ -93,7 +88,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"
},
@@ -108,7 +102,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"
},
@@ -124,7 +117,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"
},
@@ -139,7 +131,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"
@@ -154,7 +145,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"
@@ -169,7 +159,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"
@@ -184,7 +173,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"
@@ -201,7 +189,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"
},
@@ -237,7 +224,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",
@@ -254,7 +240,6 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
- "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "rm SKP_VERSION"
@@ -270,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": "rmdir skps"
@@ -292,7 +276,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 skps",
@@ -309,7 +292,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 skps"
@@ -326,7 +308,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"
},
@@ -342,7 +323,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 SKP_VERSION"
@@ -377,7 +357,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",
@@ -438,7 +417,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"
@@ -460,7 +438,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",
@@ -477,7 +454,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"
@@ -515,7 +491,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",
@@ -563,7 +538,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"
@@ -920,7 +894,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"
},
@@ -938,7 +911,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"
},
@@ -954,7 +926,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"
@@ -967,7 +938,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"
@@ -980,7 +950,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"
@@ -994,7 +963,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"
},
@@ -1009,7 +977,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"
},
@@ -1023,7 +990,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"

Powered by Google App Engine
This is Rietveld 408576698