diff options
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/bots/gen_tasks.go | 4 | ||||
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_android_flavor.py | 2 | ||||
| -rw-r--r-- | infra/bots/recipes/swarm_compile.expected/Build-Win-Clang-arm64-Release-GN_Android.json | 2 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index c337b9b591..dfc482a306 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -189,7 +189,9 @@ func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) str if strings.Contains(name, "Mac") { pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("android_ndk_darwin")) } else if strings.Contains(name, "Win") { - pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("android_ndk_windows")) + pkg := b.MustGetCipdPackageFromAsset("android_ndk_windows") + pkg.Path = "n" + pkgs = append(pkgs, pkg) } else { pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("android_ndk_linux")) } diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index d168921cb2..c31822bfe1 100644 --- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py @@ -56,7 +56,7 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils): if 'Mac' in os: ndk_asset = 'android_ndk_darwin' elif 'Win' in os: - ndk_asset = 'android_ndk_windows' + ndk_asset = 'n' quote = lambda x: '"%s"' % x args = { diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-Clang-arm64-Release-GN_Android.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-Clang-arm64-Release-GN_Android.json index dea7ec7d25..c4fcc837ad 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-Clang-arm64-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-Clang-arm64-Release-GN_Android.json @@ -90,7 +90,7 @@ "gn", "gen", "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-arm64-Release-GN_Android\\Release", - "--args=is_debug=false ndk=\"[SLAVE_BUILD]\\android_ndk_windows\" target_cpu=\"arm64\"" + "--args=is_debug=false ndk=\"[SLAVE_BUILD]\\n\" target_cpu=\"arm64\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 71d2cf714e..a5d1436e6e 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -116,7 +116,7 @@ }, { "name": "skia/bots/android_ndk_windows", - "path": "android_ndk_windows", + "path": "n", "version": "version:0" }, { |