diff options
Diffstat (limited to 'infra/bots/recipe_modules/flavor')
3 files changed, 0 insertions, 59 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Mesa.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Mesa.json deleted file mode 100644 index 3f62c184e0..0000000000 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Mesa.json +++ /dev/null @@ -1,56 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Mesa" - }, - "infra_step": true, - "name": "fetch-gn" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/skia/bin/gn", - "gen", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Mesa/Release", - "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false skia_use_mesa=true target_cpu=\"x86_64\"" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Mesa" - }, - "name": "gn gen" - }, - { - "cmd": [ - "ninja", - "-k", - "0", - "-C", - "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Mesa/Release" - ], - "cwd": "[CUSTOM_/_B_WORK]/skia", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Release-Mesa" - }, - "name": "ninja" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py index 7fdae65fe9..c3e54d562a 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.py +++ b/infra/bots/recipe_modules/flavor/examples/full.py @@ -67,7 +67,6 @@ TEST_BUILDERS = [ 'Build-Debian9-EMCC-wasm-Release', 'Build-Debian9-GCC-x86_64-Release-ANGLE', 'Build-Debian9-GCC-x86_64-Release-Flutter_Android', - 'Build-Debian9-GCC-x86_64-Release-Mesa', 'Build-Debian9-GCC-x86_64-Release-NoGPU', 'Build-Debian9-GCC-x86_64-Release-PDFium', 'Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths', diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index c7ee513a92..be2b5a81c9 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -95,8 +95,6 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): args['skia_use_fontconfig'] = 'false' if 'ASAN' in extra_config or 'UBSAN' in extra_config: args['skia_enable_spirv_validation'] = 'false' - if extra_config == 'Mesa': - args['skia_use_mesa'] = 'true' if extra_config == 'Mini': args.update({ 'is_component_build': 'true', # Proves we can link a coherent .so. |