diff options
| author |  Eric Boren <borenet@google.com> | 2017-03-21 08:20:33 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-21 12:51:40 +0000 |
| commit | bbb24f2ab83e4799ad392be3e49168425c6555b0 (patch) | |
| tree | 7ebd09fd2e1e6d45bd10193b5e369df86ae8e576 /infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json | |
| parent | 89150582643f1ef4893a0cdeaadf5886e5cde76d (diff) | |
Followup fixes for recipe roll
Simplifying some environment madness. Nobody gets to modify default_env.
Always apply it in run.__call__(). Add depot_tools path to PATH in
default_env. Result is simpler but now default_env is applied in many
more places, which should be harmless.
BUG=skia:
Change-Id: I8299d50bde2bc3e2d47568a267d1d962a3fc3d56
Reviewed-on: https://skia-review.googlesource.com/9916
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json')
| -rw-r--r-- | infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json index fa05bde932..580bee6094 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json @@ -49,12 +49,9 @@ ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_TIME": "300", - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "bot_update", @@ -93,8 +90,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" }, "infra_step": true, "name": "fetch-gn" @@ -108,8 +109,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" }, "name": "gn gen" }, @@ -121,8 +126,12 @@ ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { + "BUILDTYPE": "Debug", "CC": "/usr/bin/clang", - "CXX": "/usr/bin/clang++" + "CHROME_HEADLESS": "1", + "CXX": "/usr/bin/clang++", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot" }, "name": "ninja" }, |