1de415f2c3
Reason for revert: Breaks Ubuntu and Mac CMAKE Original issue's description: > Make SkPicture/SkImageGenerator default to SkCodec > > Remove reference to SkImageDecoder from SkPicture. Make the default > InstallPixelRefProc passed to CreateFromStream use > SkImageGenerator::NewFromEncoded instead. > > Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator. > Remove the old version that used SkImageDecoder. > > Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default > now behaves lazily. > > Update all clients to use the default. > > Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly. > > BUG=skia:4691 > BUG=skia:4290 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1671193002 > > Committed: https://skia.googlesource.com/skia/+/026388a01864c74208ad57d1ba4f711602d101c6 TBR=msarett@google.com,reed@google.com,scroggo@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:4691 Review URL: https://codereview.chromium.org/1685963004
614 lines
16 KiB
Python
614 lines
16 KiB
Python
# Copyright 2015 Google Inc.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
# GYP file to build various tools.
|
|
#
|
|
# To build on Linux:
|
|
# ./gyp_skia tools.gyp && make tools
|
|
#
|
|
{
|
|
'includes': [
|
|
'apptype_console.gypi',
|
|
],
|
|
'targets': [
|
|
{
|
|
# Build all executable targets defined below.
|
|
'target_name': 'tools',
|
|
'type': 'none',
|
|
'dependencies': [
|
|
'chrome_fuzz',
|
|
'dump_record',
|
|
'gpuveto',
|
|
'imgblur',
|
|
'imgconv',
|
|
'imgslice',
|
|
'lua_app',
|
|
'lua_pictures',
|
|
'pinspect',
|
|
'skdiff',
|
|
'skhello',
|
|
'skpinfo',
|
|
'skpmaker',
|
|
'test_image_decoder',
|
|
'test_public_includes',
|
|
'whitelist_typefaces',
|
|
],
|
|
'conditions': [
|
|
['skia_shared_lib',
|
|
{
|
|
'dependencies': [
|
|
'sklua', # This can only be built if skia is built as a shared library
|
|
],
|
|
},
|
|
],
|
|
[ 'skia_os == "android"',
|
|
{
|
|
'dependencies': [
|
|
# Build this by default to catch compile errors more quickly, since
|
|
# the only other time this code is exercised in the android framework
|
|
'android_utils',
|
|
],
|
|
},
|
|
],
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'android_utils',
|
|
'type': 'static_library',
|
|
'dependencies': [
|
|
'core.gyp:core',
|
|
],
|
|
'sources': [
|
|
'../tools/android/SkAndroidSDKCanvas.h',
|
|
'../tools/android/SkAndroidSDKCanvas.cpp',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'../tools/android',
|
|
],
|
|
},
|
|
},
|
|
{
|
|
'target_name': 'dump_record',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/dump_record.cpp',
|
|
'../tools/DumpRecord.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../include/private',
|
|
'../src/core',
|
|
],
|
|
'dependencies': [
|
|
'flags.gyp:flags',
|
|
'lazy_decode_bitmap',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'chrome_fuzz',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/chrome_fuzz.cpp',
|
|
],
|
|
'dependencies': [
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'crash_handler',
|
|
'type': 'static_library',
|
|
'sources': [ '../tools/CrashHandler.cpp' ],
|
|
'dependencies': [ 'skia_lib.gyp:skia_lib' ],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [ '../tools' ],
|
|
},
|
|
'conditions': [
|
|
[ 'skia_is_bot', {
|
|
'defines': [ 'SK_CRASH_HANDLER' ],
|
|
}],
|
|
],
|
|
|
|
'all_dependent_settings': {
|
|
'msvs_settings': {
|
|
'VCLinkerTool': {
|
|
'AdditionalDependencies': [ 'Dbghelp.lib' ],
|
|
}
|
|
},
|
|
}
|
|
},
|
|
{
|
|
'target_name': 'resources',
|
|
'type': 'static_library',
|
|
'sources': [ '../tools/Resources.cpp' ],
|
|
'dependencies': [
|
|
'flags.gyp:flags',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [ '../tools', ],
|
|
},
|
|
},
|
|
{
|
|
'target_name': 'sk_tool_utils',
|
|
'type': 'static_library',
|
|
'sources': [
|
|
'../tools/sk_tool_utils.cpp',
|
|
'../tools/sk_tool_utils_font.cpp',
|
|
'../tools/random_parse_path.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../include/private',
|
|
'../src/fonts',
|
|
'../src/core',
|
|
],
|
|
'dependencies': [
|
|
'resources',
|
|
'flags.gyp:flags',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [ '../tools', ],
|
|
},
|
|
},
|
|
{
|
|
'target_name' : 'timer',
|
|
'type': 'static_library',
|
|
'sources': [ '../tools/timer/Timer.cpp' ],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': ['../tools/timer'],
|
|
},
|
|
'dependencies': [ 'skia_lib.gyp:skia_lib' ],
|
|
},
|
|
{
|
|
'target_name': 'skdiff',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/skdiff.cpp',
|
|
'../tools/skdiff.h',
|
|
'../tools/skdiff_html.cpp',
|
|
'../tools/skdiff_html.h',
|
|
'../tools/skdiff_main.cpp',
|
|
'../tools/skdiff_utils.cpp',
|
|
'../tools/skdiff_utils.h',
|
|
],
|
|
'dependencies': [
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'skpmaker',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/skpmaker.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../include/private',
|
|
'../src/core',
|
|
],
|
|
'dependencies': [
|
|
'flags.gyp:flags',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'skimagediff',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/skdiff.cpp',
|
|
'../tools/skdiff.h',
|
|
'../tools/skdiff_html.cpp',
|
|
'../tools/skdiff_html.h',
|
|
'../tools/skdiff_image.cpp',
|
|
'../tools/skdiff_utils.cpp',
|
|
'../tools/skdiff_utils.h',
|
|
],
|
|
'dependencies': [
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'skhello',
|
|
'type': 'executable',
|
|
'dependencies': [
|
|
'flags.gyp:flags',
|
|
'pdf.gyp:pdf',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
'sources': [
|
|
'../tools/skhello.cpp',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'skpinfo',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/skpinfo.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../include/private',
|
|
'../src/core/',
|
|
],
|
|
'dependencies': [
|
|
'flags.gyp:flags',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'imgblur',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/imgblur.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../include/core',
|
|
],
|
|
'dependencies': [
|
|
'flags.gyp:flags',
|
|
'flags.gyp:flags_common',
|
|
'skia_lib.gyp:skia_lib',
|
|
'tools.gyp:sk_tool_utils',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'imgslice',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/imgslice.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../include/core',
|
|
],
|
|
'dependencies': [
|
|
'flags.gyp:flags',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'lazy_decode_bitmap',
|
|
'type': 'static_library',
|
|
'sources': [ '../tools/LazyDecodeBitmap.cpp' ],
|
|
'include_dirs': [
|
|
'../include/private',
|
|
'../src/core',
|
|
'../src/lazy',
|
|
],
|
|
'dependencies': [
|
|
'flags.gyp:flags',
|
|
'skia_lib.gyp:skia_lib'
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'gpuveto',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/gpuveto.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../include/private',
|
|
'../src/core/',
|
|
'../src/images',
|
|
],
|
|
'dependencies': [
|
|
'lazy_decode_bitmap',
|
|
'flags.gyp:flags',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'lua_app',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/lua/lua_app.cpp',
|
|
'../src/utils/SkLua.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../include/private',
|
|
# Lua exposes GrReduceClip which in turn requires src/core for SkTLList
|
|
'../src/gpu/',
|
|
'../src/core/',
|
|
],
|
|
'dependencies': [
|
|
'effects.gyp:effects',
|
|
'images.gyp:images',
|
|
'lua.gyp:lua',
|
|
'pdf.gyp:pdf',
|
|
'ports.gyp:ports',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'lua_pictures',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/lua/lua_pictures.cpp',
|
|
'../src/utils/SkLuaCanvas.cpp',
|
|
'../src/utils/SkLua.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../include/private',
|
|
# Lua exposes GrReduceClip which in turn requires src/core for SkTLList
|
|
'../src/gpu/',
|
|
'../src/core/',
|
|
],
|
|
'dependencies': [
|
|
'lazy_decode_bitmap',
|
|
'effects.gyp:effects',
|
|
'flags.gyp:flags',
|
|
'images.gyp:images',
|
|
'lua.gyp:lua',
|
|
'tools.gyp:picture_utils',
|
|
'pdf.gyp:pdf',
|
|
'ports.gyp:ports',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'picture_utils',
|
|
'type': 'static_library',
|
|
'sources': [
|
|
'../tools/picture_utils.cpp',
|
|
'../tools/picture_utils.h',
|
|
],
|
|
'dependencies': [
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'../tools/',
|
|
],
|
|
},
|
|
},
|
|
{
|
|
'target_name': 'pinspect',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/pinspect.cpp',
|
|
],
|
|
'dependencies': [
|
|
'lazy_decode_bitmap',
|
|
'flags.gyp:flags',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'imgconv',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/imgconv.cpp',
|
|
],
|
|
'dependencies': [
|
|
'flags.gyp:flags',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'test_image_decoder',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/test_image_decoder.cpp',
|
|
],
|
|
'dependencies': [
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'proc_stats',
|
|
'type': 'static_library',
|
|
'sources': [
|
|
'../tools/ProcStats.h',
|
|
'../tools/ProcStats.cpp',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [ '../tools', ],
|
|
},
|
|
},
|
|
{
|
|
'target_name': 'url_data_manager',
|
|
'type': 'static_library',
|
|
'sources': [
|
|
'../tools/UrlDataManager.h',
|
|
'../tools/UrlDataManager.cpp',
|
|
],
|
|
'dependencies': [
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
'include_dirs': [
|
|
'../include/private',
|
|
'../src/core',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'../include/private',
|
|
'../tools',
|
|
],
|
|
},
|
|
},
|
|
{
|
|
'target_name': 'whitelist_typefaces',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/whitelist_typefaces.cpp',
|
|
],
|
|
'dependencies': [
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'thermal_manager',
|
|
'type': 'static_library',
|
|
'sources': [
|
|
'../tools/ThermalManager.cpp',
|
|
],
|
|
'dependencies': [
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [ '../tools', ],
|
|
},
|
|
},
|
|
{
|
|
'target_name': 'test_public_includes',
|
|
'type': 'static_library',
|
|
# Ensure that our public headers don't have unused params so that clients
|
|
# (e.g. Android) that include us can build with these warnings enabled
|
|
'cflags!': [ '-Wno-unused-parameter' ],
|
|
'variables': {
|
|
'includes_to_test': [
|
|
'<(skia_include_path)/android',
|
|
'<(skia_include_path)/animator',
|
|
'<(skia_include_path)/c',
|
|
'<(skia_include_path)/codec',
|
|
'<(skia_include_path)/config',
|
|
'<(skia_include_path)/core',
|
|
'<(skia_include_path)/effects',
|
|
'<(skia_include_path)/gpu',
|
|
'<(skia_include_path)/images',
|
|
'<(skia_include_path)/pathops',
|
|
'<(skia_include_path)/ports',
|
|
'<(skia_include_path)/svg/parser',
|
|
'<(skia_include_path)/utils',
|
|
'<(skia_include_path)/views',
|
|
'<(skia_include_path)/xml',
|
|
],
|
|
'paths_to_ignore': [
|
|
'<(skia_include_path)/gpu/gl/GrGLConfig_chrome.h',
|
|
'<(skia_include_path)/ports/SkFontMgr_fontconfig.h',
|
|
'<(skia_include_path)/ports/SkTypeface_mac.h',
|
|
'<(skia_include_path)/ports/SkTypeface_win.h',
|
|
'<(skia_include_path)/utils/ios',
|
|
'<(skia_include_path)/utils/mac',
|
|
'<(skia_include_path)/utils/win',
|
|
'<(skia_include_path)/utils/SkDebugUtils.h',
|
|
'<(skia_include_path)/utils/SkJSONCPP.h',
|
|
'<(skia_include_path)/views/animated',
|
|
'<(skia_include_path)/views/SkOSWindow_Android.h',
|
|
'<(skia_include_path)/views/SkOSWindow_iOS.h',
|
|
'<(skia_include_path)/views/SkOSWindow_Mac.h',
|
|
'<(skia_include_path)/views/SkOSWindow_SDL.h',
|
|
'<(skia_include_path)/views/SkOSWindow_Unix.h',
|
|
'<(skia_include_path)/views/SkOSWindow_Win.h',
|
|
'<(skia_include_path)/views/SkWindow.h',
|
|
],
|
|
},
|
|
'include_dirs': [
|
|
'<@(includes_to_test)',
|
|
],
|
|
'sources': [
|
|
# unused_param_test.cpp is generated by the action below.
|
|
'<(INTERMEDIATE_DIR)/test_public_includes.cpp',
|
|
],
|
|
'actions': [
|
|
{
|
|
'action_name': 'generate_includes_cpp',
|
|
'inputs': [
|
|
'../tools/generate_includes_cpp.py',
|
|
'<@(includes_to_test)',
|
|
# This causes the gyp generator on mac to fail
|
|
#'<@(paths_to_ignore)',
|
|
],
|
|
'outputs': [
|
|
'<(INTERMEDIATE_DIR)/test_public_includes.cpp',
|
|
],
|
|
'action': ['python', '../tools/generate_includes_cpp.py',
|
|
'--ignore', '<(paths_to_ignore)',
|
|
'<@(_outputs)', '<@(includes_to_test)'],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
'conditions': [
|
|
['skia_shared_lib',
|
|
{
|
|
'targets': [
|
|
{
|
|
'target_name': 'sklua',
|
|
'product_name': 'skia',
|
|
'product_prefix': '',
|
|
'product_dir': '<(PRODUCT_DIR)/',
|
|
'type': 'shared_library',
|
|
'sources': [
|
|
'../src/utils/SkLuaCanvas.cpp',
|
|
'../src/utils/SkLua.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../include/private',
|
|
# Lua exposes GrReduceClip which in turn requires src/core for SkTLList
|
|
'../src/gpu/',
|
|
'../src/core/',
|
|
'../third_party/lua/src/',
|
|
],
|
|
'dependencies': [
|
|
'lua.gyp:lua',
|
|
'pdf.gyp:pdf',
|
|
'skia_lib.gyp:skia_lib',
|
|
],
|
|
'conditions': [
|
|
['skia_os != "win"',
|
|
{
|
|
'ldflags': [
|
|
'-Wl,-rpath,\$$ORIGIN,--enable-new-dtags',
|
|
],
|
|
},
|
|
],
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
['skia_win_debuggers_path and skia_os == "win"',
|
|
{
|
|
'targets': [
|
|
{
|
|
'target_name': 'win_dbghelp',
|
|
'type': 'static_library',
|
|
'defines': [
|
|
'SK_CDB_PATH="<(skia_win_debuggers_path)"',
|
|
],
|
|
'sources': [
|
|
'../tools/win_dbghelp.h',
|
|
'../tools/win_dbghelp.cpp',
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
['skia_os == "win"',
|
|
{
|
|
'targets': [
|
|
{
|
|
'target_name': 'win_lcid',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/win_lcid.cpp',
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
['skia_os == "mac"',
|
|
{
|
|
'targets': [
|
|
{
|
|
'target_name': 'create_test_font',
|
|
'type': 'executable',
|
|
'sources': [
|
|
'../tools/create_test_font.cpp',
|
|
],
|
|
'include_dirs': [
|
|
'../include/private',
|
|
'../src/core',
|
|
],
|
|
'dependencies': [
|
|
'flags.gyp:flags',
|
|
'skia_lib.gyp:skia_lib',
|
|
'resources',
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
],
|
|
}
|