diff options
| -rw-r--r-- | BUILD.gn | 11 | ||||
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 3 | ||||
| -rw-r--r-- | infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json | 41 |
3 files changed, 38 insertions, 17 deletions
@@ -14,6 +14,7 @@ declare_args() { skia_use_expat = true skia_use_fontconfig = is_linux skia_use_freetype = is_android || is_fuchsia || is_linux + skia_use_gdi = false skia_use_giflib = !is_fuchsia skia_use_libjpeg_turbo = true skia_use_libpng = true @@ -542,7 +543,6 @@ component("skia") { "src/ports/SkDebug_win.cpp", "src/ports/SkFontHost_win.cpp", "src/ports/SkFontMgr_win_dw.cpp", - "src/ports/SkFontMgr_win_dw_factory.cpp", "src/ports/SkImageEncoder_WIC.cpp", "src/ports/SkImageGeneratorWIC.cpp", "src/ports/SkOSFile_win.cpp", @@ -553,6 +553,15 @@ component("skia") { "src/xps/SkDocument_XPS.cpp", "src/xps/SkXPSDevice.cpp", ] + if (skia_use_gdi) { + sources += [ "src/ports/SkFontMgr_win_gdi_factory.cpp" ] + libs += [ + "Gdi32.lib", + "Usp10.lib", + ] + } else { + sources += [ "src/ports/SkFontMgr_win_dw_factory.cpp" ] + } sources -= [ get_path_info("src/utils/SkThreadUtils_pthread.cpp", "abspath") ] libs += [ diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index a189536eb9..d06d7c4226 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -18,6 +18,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): extra_config == 'CommandBuffer', extra_config == 'Exceptions', extra_config == 'Fast', + extra_config == 'GDI', extra_config == 'GN', extra_config == 'Mesa', extra_config == 'NoGPU', @@ -93,6 +94,8 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): args['skia_use_angle'] = 'true' if extra_config == 'CommandBuffer': self.m.run.run_once(self.build_command_buffer) + if extra_config == 'GDI': + args['skia_use_gdi'] = 'true' if extra_config == 'MSAN': args['skia_use_fontconfig'] = 'false' if extra_config == 'Mesa': diff --git a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json index cd08ff7e65..38d8f64043 100644 --- a/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipes/swarm_compile.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -123,30 +123,39 @@ "cmd": [ "python", "-u", - "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py", - "--win_toolchain_json", - "[SLAVE_BUILD]\\src\\build\\win_toolchain.json", - "--depot_tools_parent_dir", - "[SLAVE_BUILD]" + "[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn" ], - "name": "bootstrap win toolchain" + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "env": { + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "fetch-gn" }, { "cmd": [ - "python", - "make.py", - "most" + "gn.bat", + "gen", + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI\\Release", + "--args=is_debug=false skia_use_gdi=true target_cpu=\"x86\" windk=\"[SLAVE_BUILD]\\t\\depot_tools\\win_toolchain\\vs_files\\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\"" ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "CHROME_PATH": "[SLAVE_BUILD]\\src", - "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];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI" + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja.exe", + "-C", + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Release-GDI\\Release" + ], + "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", + "env": { + "NINJA_STATUS": "%%e [%%f/%%t] ", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "build most" + "name": "ninja" }, { "cmd": [ |