| Index: infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json
|
| diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json
|
| similarity index 95%
|
| copy from infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json
|
| copy to infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json
|
| index f30c83e11551a990ce179705ccf26bdc02b247c8..5036c34d2676c14da8548175edcf15413887c0eb 100644
|
| --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Debug.json
|
| +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json
|
| @@ -32,10 +32,10 @@
|
| ],
|
| "cwd": "[CUSTOM_C:\\_B_WORK]",
|
| "env": {
|
| - "BUILDTYPE": "Debug",
|
| + "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
|
| - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
|
| + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI"
|
| },
|
| "name": "gclient setup"
|
| },
|
| @@ -56,10 +56,10 @@
|
| ],
|
| "cwd": "[CUSTOM_C:\\_B_WORK]",
|
| "env": {
|
| - "BUILDTYPE": "Debug",
|
| + "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
|
| - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
|
| + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI"
|
| },
|
| "name": "gclient sync",
|
| "~followup_annotations": [
|
| @@ -94,12 +94,12 @@
|
| ],
|
| "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
|
| "env": {
|
| - "BUILDTYPE": "Debug",
|
| + "BUILDTYPE": "Release",
|
| "CHROME_HEADLESS": "1",
|
| "CHROME_PATH": "[SLAVE_BUILD]\\src",
|
| - "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
|
| + "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_gdi=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
|
| - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
|
| + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI"
|
| },
|
| "name": "build most"
|
| },
|
| @@ -108,8 +108,8 @@
|
| "python",
|
| "-u",
|
| "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
|
| - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Debug"
|
| + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI\\Release",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Release"
|
| ],
|
| "name": "copy build products",
|
| "~followup_annotations": [
|
|
|