[recipes] Remove build environment vars from default_env

infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json

 [
   {
     "cmd": [
       "which",
       "adb"
     ],
     "name": "which adb",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_EXCEPTION@@@"
     ]
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for device (1)"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for charge (1)"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "echo",
       "$EXTERNAL_STORAGE"
     ],
     "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",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "root"
     ],
     "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",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "sleep",
       "10"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for device (2)"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for charge (2)"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_kill_skia",
       "--verbose"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "kill skia"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "stop"
     ],
     "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"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "dumpsys",
       "batteryproperties"
     ],
     "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"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "cat",
       "/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"
     ],
     "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"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "cat",
       "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"
     ],
     "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"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed",
       "--verbose",
       "[SLAVE_BUILD]/skia/resources",
       "/storage/emulated/legacy/skiabot/skia_resources"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "push resources"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
@@ skipping 15 matching lines @@
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "cat",
       "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
     ],
     "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",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
@@ skipping 15 matching lines @@
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "cat",
       "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
     ],
     "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",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
@@ skipping 40 matching lines @@
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "rm",
       "-r",
       "/storage/emulated/legacy/skiabot/skia_dm"
     ],
     "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"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "if",
       "[",
       "-e",
       "/storage/emulated/legacy/skiabot/skia_dm",
       "];",
       "then",
       "echo",
       "FILE_EXISTS;",
       "fi"
     ],
     "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",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "mkdir",
       "-p",
       "/storage/emulated/legacy/skiabot/skia_dm"
     ],
     "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"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
       "[SLAVE_BUILD]/tmp",
@@ skipping 17 matching lines @@
     "cmd": [
       "python",
       "-u",
       "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = 'https://gold.skia.org/_/hashes'\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n  try:\n    with contextlib.closing(\n        urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n      hashes = w.read()\n      with open(sys.argv[1], 'w') as f:\n        f.write(hashes)\n        break\n  except Exception as e:\n    print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n    print e\n    if retry == RETRIES:\n      raise\n    waittime = WAIT_BASE * math.pow(2, retry)\n    print 'Retry in %d seconds.' % waittime\n    time.sleep(waittime)\n",
       "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "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",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import contextlib@@@",
       "@@@STEP_LOG_LINE@python.inline@import math@@@",
       "@@@STEP_LOG_LINE@python.inline@import socket@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys@@@",
       "@@@STEP_LOG_LINE@python.inline@import time@@@",
@@ skipping 27 matching lines @@
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "push",
       "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
       "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt"
     ],
     "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"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_run_skia",
       "--verbose",
       "--logcat",
       "-d",
@@ skipping 336 matching lines @@
       "_",
       "image",
       "_",
       ".SRW"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "dm"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_pull_if_needed",
       "--verbose",
       "/storage/emulated/legacy/skiabot/skia_dm",
       "[CUSTOM_[SWARM_OUT_DIR]]/dm"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "pull skia_dm"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "dumpsys",
       "batteryproperties"
     ],
     "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"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "reboot"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "reboot"
   },
   {
     "cmd": [
       "sleep",
       "10"
     ],
     "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"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for device (3)"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
-      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for charge (3)"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "kill-server"
     ],
     "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"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]