diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-03-19 17:39:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-20 14:05:33 +0000 |
| commit | 7b065e124c8b8fe83aa68fe4ee9ddb28820feffb (patch) | |
| tree | 0f6951485e1b6af1ef01fbfe74374466a3efae0e /infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json | |
| parent | f20710e00cbb978942fe5a5ffb35be847bde6eb2 (diff) | |
[recipes] Add toolchain version to extra_cflags.
In compile recipes, add a dummy define (e.g.
-DDUMMY_clang_linux_version=42) to the compiler flags so that ninja will
recompile from scratch when the toolchain changes.
Bug: skia:7720
Change-Id: I9a330b21af364b3aa6a1eebbe6ac2022cfa82fdc
Reviewed-on: https://skia-review.googlesource.com/115160
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json')
| -rw-r--r-- | infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json index 18239499e6..7afd40428e 100644 --- a/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Debian9-Clang-arm64-Release-Android_Vulkan.json @@ -97,6 +97,24 @@ "cmd": [ "python", "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/android_ndk_linux/VERSION", + "/path/to/tmp/" + ], + "env": { + "CC": "/usr/bin/clang", + "CXX": "/usr/bin/clang++" + }, + "infra_step": true, + "name": "Get android_ndk_linux VERSION" + }, + { + "cmd": [ + "python", + "-u", "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" ], "cwd": "[CUSTOM_/_B_WORK]/skia", @@ -116,7 +134,7 @@ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-arm64-Release-Android_Vulkan/Release", - "--args=is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" ndk_api=24 skia_enable_vulkan_debug_layers=false target_cpu=\"arm64\"" + "--args=extra_cflags=[\"-DDUMMY_ndk_version=42\"] is_debug=false ndk=\"[START_DIR]/android_ndk_linux\" ndk_api=24 skia_enable_vulkan_debug_layers=false target_cpu=\"arm64\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { |