Skip to content

Commit

Permalink
Remove all .h files from Skia build lists.
Browse files Browse the repository at this point in the history
Listing headers in GN or GYP files has no effect on the build
and only serves to make moving headers around more difficult, e.g.

ERROR at //skia/BUILD.gn:395:5: Item not found
    "//third_party/skia/src/utils/SkTLogic.h",
        ^----------------------------------------
        You were trying to remove "//third_party/skia/src/utils/SkTLogic.h"
        from the list but it wasn't there.

BUG=

Review URL: https://codereview.chromium.org/1220063002

Cr-Commit-Position: refs/heads/master@{#337080}
  • Loading branch information
mtklein authored and Commit bot committed Jul 1, 2015
1 parent 1d48952 commit 0d51686
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 165 deletions.
84 changes: 7 additions & 77 deletions skia/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -277,58 +277,33 @@ config("skia_library_config") {
component("skia") {
sources = [
# Chrome sources.
"config/SkUserConfig.h",
"ext/SkDiscardableMemory_chrome.cc",
"ext/SkDiscardableMemory_chrome.h",
"ext/SkMemory_new_handler.cpp",
"ext/analysis_canvas.cc",
"ext/analysis_canvas.h",
"ext/benchmarking_canvas.cc",
"ext/benchmarking_canvas.h",
"ext/bitmap_platform_device.h",
"ext/convolver.cc",
"ext/convolver.h",
"ext/event_tracer_impl.cc",
"ext/event_tracer_impl.h",
"ext/fontmgr_default_win.cc",
"ext/fontmgr_default_win.h",
"ext/google_logging.cc",
"ext/image_operations.cc",
"ext/image_operations.h",
"ext/opacity_filter_canvas.cc",
"ext/opacity_filter_canvas.h",
"ext/pixel_ref_utils.cc",
"ext/pixel_ref_utils.h",
"ext/platform_canvas.cc",
"ext/platform_canvas.h",
"ext/platform_device.cc",
"ext/platform_device.h",
"ext/platform_device_linux.cc",
"ext/platform_device_mac.cc",
"ext/platform_device_win.cc",
"ext/recursive_gaussian_convolution.cc",
"ext/recursive_gaussian_convolution.h",
"ext/refptr.h",
"ext/skia_utils_base.cc",
"ext/skia_utils_base.h",
"ext/skia_utils_ios.h",
"ext/skia_utils_ios.mm",
"ext/skia_utils_mac.h",
"ext/skia_utils_mac.mm",
"ext/skia_utils_win.cc",
"ext/skia_utils_win.h",
]

if (current_cpu == "x86" || current_cpu == "x64") {
sources += [
"ext/convolver_SSE2.cc",
"ext/convolver_SSE2.h",
]
sources += [ "ext/convolver_SSE2.cc" ]
} else if (current_cpu == "mipsel" && mips_dsp_rev >= 2) {
sources += [
"ext/convolver_mips_dspr2.cc",
"ext/convolver_mips_dspr2.h",
]
sources += [ "ext/convolver_mips_dspr2.cc" ]
}

# The skia gypi values are relative to the skia_dir, so we need to rebase.
Expand All @@ -341,10 +316,7 @@ component("skia") {
allow_circular_includes_from = [ ":skia_opts" ]

if (current_cpu == "arm") {
sources += [
"//third_party/skia/src/core/SkUtilsArm.cpp",
"//third_party/skia/src/core/SkUtilsArm.h",
]
sources += [ "//third_party/skia/src/core/SkUtilsArm.cpp" ]
}

# GPU
Expand All @@ -355,52 +327,28 @@ component("skia") {

# Remove unused util files include in utils.gypi
sources -= [
"//third_party/skia/include/utils/SkBoundaryPatch.h",
"//third_party/skia/include/utils/SkCamera.h",
"//third_party/skia/include/utils/SkCanvasStateUtils.h",
"//third_party/skia/include/utils/SkCubicInterval.h",
"//third_party/skia/include/utils/SkCullPoints.h",
"//third_party/skia/include/utils/SkDebugUtils.h",
"//third_party/skia/include/utils/SkDumpCanvas.h",
"//third_party/skia/include/utils/SkEventTracer.h",
"//third_party/skia/include/utils/SkFrontBufferedStream.h",
"//third_party/skia/include/utils/SkInterpolator.h",
"//third_party/skia/include/utils/SkLayer.h",
"//third_party/skia/include/utils/SkMeshUtils.h",
"//third_party/skia/include/utils/SkNinePatch.h",
"//third_party/skia/include/utils/SkParsePaint.h",
"//third_party/skia/include/utils/SkParsePath.h",
"//third_party/skia/include/utils/SkRandom.h",
"//third_party/skia/src/utils/SkBitmapHasher.cpp",
"//third_party/skia/src/utils/SkBitmapHasher.h",
"//third_party/skia/src/utils/SkBoundaryPatch.cpp",
"//third_party/skia/src/utils/SkCamera.cpp",
"//third_party/skia/src/utils/SkCanvasStack.h",
"//third_party/skia/src/utils/SkCubicInterval.cpp",
"//third_party/skia/src/utils/SkCullPoints.cpp",
"//third_party/skia/src/utils/SkDumpCanvas.cpp",
"//third_party/skia/src/utils/SkFloatUtils.h",
"//third_party/skia/src/utils/SkFrontBufferedStream.cpp",
"//third_party/skia/src/utils/SkInterpolator.cpp",
"//third_party/skia/src/utils/SkLayer.cpp",
"//third_party/skia/src/utils/SkMD5.cpp",
"//third_party/skia/src/utils/SkMD5.h",
"//third_party/skia/src/utils/SkMeshUtils.cpp",
"//third_party/skia/src/utils/SkNinePatch.cpp",
"//third_party/skia/src/utils/SkOSFile.cpp",
"//third_party/skia/src/utils/SkParsePath.cpp",
"//third_party/skia/src/utils/SkSHA1.cpp",
"//third_party/skia/src/utils/SkSHA1.h",
"//third_party/skia/src/utils/SkTFitsIn.h",
"//third_party/skia/src/utils/SkTLogic.h",

# We don't currently need to change thread affinity, so leave out this complexity for now.
"//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
"//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",

#testing
"//third_party/skia/src/fonts/SkGScalerContext.cpp",
"//third_party/skia/src/fonts/SkGScalerContext.h",
]

if (is_win) {
Expand All @@ -421,10 +369,6 @@ component("skia") {
if (is_win) {
sources -= [
#windows
"//third_party/skia/include/utils/win/SkAutoCoInitialize.h",
"//third_party/skia/include/utils/win/SkHRESULT.h",
"//third_party/skia/include/utils/win/SkIStream.h",
"//third_party/skia/include/utils/win/SkTScopedComPtr.h",
"//third_party/skia/src/utils/win/SkAutoCoInitialize.cpp",
"//third_party/skia/src/utils/win/SkIStream.cpp",
"//third_party/skia/src/utils/win/SkWGL_win.cpp",
Expand All @@ -449,10 +393,8 @@ component("skia") {
"//third_party/skia/src/ports/SkOSFile_win.cpp",
"//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp",
"//third_party/skia/src/ports/SkScalerContext_win_dw.cpp",
"//third_party/skia/src/ports/SkScalerContext_win_dw.h",
"//third_party/skia/src/ports/SkTLS_win.cpp",
"//third_party/skia/src/ports/SkTypeface_win_dw.cpp",
"//third_party/skia/src/ports/SkTypeface_win_dw.h",
]
}
if (!is_android) {
Expand Down Expand Up @@ -483,25 +425,13 @@ component("skia") {

# Select the right BitmapPlatformDevice.
if (is_win) {
sources += [
"ext/bitmap_platform_device_win.cc",
"ext/bitmap_platform_device_win.h",
]
sources += [ "ext/bitmap_platform_device_win.cc" ]
} else if (is_mac) {
sources += [
"ext/bitmap_platform_device_mac.cc",
"ext/bitmap_platform_device_mac.h",
]
sources += [ "ext/bitmap_platform_device_mac.cc" ]
} else if (use_cairo) {
sources += [
"ext/bitmap_platform_device_cairo.cc",
"ext/bitmap_platform_device_cairo.h",
]
sources += [ "ext/bitmap_platform_device_cairo.cc" ]
} else {
sources += [
"ext/bitmap_platform_device_skia.cc",
"ext/bitmap_platform_device_skia.h",
]
sources += [ "ext/bitmap_platform_device_skia.cc" ]
}

if (is_clang) {
Expand Down
1 change: 0 additions & 1 deletion skia/skia.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@
# Note: file list duplicated in GN build.
'public/interfaces/bitmap.mojom',
'public/type_converters.cc',
'public/type_converters.h',
],
},
],
Expand Down
26 changes: 0 additions & 26 deletions skia/skia_chrome.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -26,56 +26,32 @@
],
},
'sources': [
'config/SkUserConfig.h',

# Note: file list duplicated in GN build.
'ext/analysis_canvas.cc',
'ext/analysis_canvas.h',
'ext/benchmarking_canvas.cc',
'ext/benchmarking_canvas.h',
'ext/bitmap_platform_device.h',
'ext/bitmap_platform_device_cairo.cc',
'ext/bitmap_platform_device_cairo.h',
'ext/bitmap_platform_device_mac.cc',
'ext/bitmap_platform_device_mac.h',
'ext/bitmap_platform_device_skia.cc',
'ext/bitmap_platform_device_skia.h',
'ext/bitmap_platform_device_win.cc',
'ext/bitmap_platform_device_win.h',
'ext/convolver.cc',
'ext/convolver.h',
'ext/event_tracer_impl.cc',
'ext/event_tracer_impl.h',
'ext/fontmgr_default_win.cc',
'ext/fontmgr_default_win.h',
'ext/google_logging.cc',
'ext/image_operations.cc',
'ext/image_operations.h',
'ext/opacity_filter_canvas.cc',
'ext/opacity_filter_canvas.h',
'ext/pixel_ref_utils.cc',
'ext/pixel_ref_utils.h',
'ext/platform_canvas.cc',
'ext/platform_canvas.h',
'ext/platform_device.cc',
'ext/platform_device.h',
'ext/platform_device_linux.cc',
'ext/platform_device_mac.cc',
'ext/platform_device_win.cc',
'ext/recursive_gaussian_convolution.cc',
'ext/recursive_gaussian_convolution.h',
'ext/refptr.h',
'ext/SkDiscardableMemory_chrome.h',
'ext/SkDiscardableMemory_chrome.cc',
'ext/SkMemory_new_handler.cpp',
'ext/skia_utils_base.cc',
'ext/skia_utils_base.h',
'ext/skia_utils_ios.mm',
'ext/skia_utils_ios.h',
'ext/skia_utils_mac.mm',
'ext/skia_utils_mac.h',
'ext/skia_utils_win.cc',
'ext/skia_utils_win.h',
],
'conditions': [
[ 'OS == "android" and '
Expand All @@ -93,13 +69,11 @@
target_arch != "arm64" and target_arch != "mips64el"', {
'sources': [
'ext/convolver_SSE2.cc',
'ext/convolver_SSE2.h',
],
}],
[ 'target_arch == "mipsel" and mips_dsp_rev >= 2',{
'sources': [
'ext/convolver_mips_dspr2.cc',
'ext/convolver_mips_dspr2.h',
],
}],
],
Expand Down
10 changes: 0 additions & 10 deletions skia/skia_gn_files.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,13 @@

'<(skia_src_path)/ports/SkImageGenerator_none.cpp',

'<(skia_include_path)/images/SkMovie.h',
'<(skia_include_path)/images/SkPageFlipper.h',
'<(skia_include_path)/ports/SkTypeface_win.h',
'<(skia_src_path)/fonts/SkFontMgr_fontconfig.cpp',
'<(skia_src_path)/fonts/SkFontMgr_indirect.cpp',
'<(skia_src_path)/fonts/SkRemotableFontMgr.cpp',
'<(skia_src_path)/images/SkScaledBitmapSampler.cpp',
'<(skia_src_path)/images/SkScaledBitmapSampler.h',
'<(skia_src_path)/ports/SkFontConfigInterface_direct.cpp',
'<(skia_src_path)/ports/SkFontHost_fontconfig.cpp',
'<(skia_src_path)/ports/SkFontHost_FreeType_common.cpp',
'<(skia_src_path)/ports/SkFontHost_FreeType_common.h',
'<(skia_src_path)/ports/SkFontHost_FreeType.cpp',
'<(skia_src_path)/ports/SkFontHost_mac.cpp',
'<(skia_src_path)/ports/SkFontHost_win.cpp',
Expand All @@ -33,16 +28,12 @@
'<(skia_src_path)/ports/SkOSFile_stdio.cpp',
'<(skia_src_path)/ports/SkOSFile_win.cpp',
'<(skia_src_path)/ports/SkScalerContext_win_dw.cpp',
'<(skia_src_path)/ports/SkScalerContext_win_dw.h',
'<(skia_src_path)/ports/SkTime_Unix.cpp',
'<(skia_src_path)/ports/SkTLS_pthread.cpp',
'<(skia_src_path)/ports/SkTLS_win.cpp',
'<(skia_src_path)/ports/SkTypeface_win_dw.cpp',
'<(skia_src_path)/ports/SkTypeface_win_dw.h',
'<(skia_src_path)/sfnt/SkOTTable_name.cpp',
'<(skia_src_path)/sfnt/SkOTTable_name.h',
'<(skia_src_path)/sfnt/SkOTUtils.cpp',
'<(skia_src_path)/sfnt/SkOTUtils.h',

#mac
'<(skia_src_path)/utils/mac/SkStream_mac.cpp',
Expand All @@ -51,6 +42,5 @@

#testing
'<(skia_src_path)/fonts/SkGScalerContext.cpp',
'<(skia_src_path)/fonts/SkGScalerContext.h',
],
}
Loading

0 comments on commit 0d51686

Please sign in to comment.