[bazel] Fix/update rules
This regenerates the files and fixes the harfbuzz rule so CanvasKit compiles. Change-Id: I2db2bddaabf793f360e8a4fa1a6a2b96222dfdf8 Bug: skia:12541 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522816 Reviewed-by: Ben Wagner <bungeman@google.com>
This commit is contained in:
parent
5789d87b6c
commit
0364f7b80e
@ -22,6 +22,7 @@ known_good_builds:
|
|||||||
bazelisk build //:skia_core --config=clang --sandbox_base=/dev/shm
|
bazelisk build //:skia_core --config=clang --sandbox_base=/dev/shm
|
||||||
bazelisk build //src/sksl/lex:sksllex --config=clang --sandbox_base=/dev/shm
|
bazelisk build //src/sksl/lex:sksllex --config=clang --sandbox_base=/dev/shm
|
||||||
bazelisk build //tools/skdiff --config=clang --sandbox_base=/dev/shm
|
bazelisk build //tools/skdiff --config=clang --sandbox_base=/dev/shm
|
||||||
|
bazelisk build //modules/canvaskit:canvaskit_wasm --compilation_mode opt --sandbox_base=/dev/shm
|
||||||
|
|
||||||
# Test the enforcement of include what you use
|
# Test the enforcement of include what you use
|
||||||
bazelisk build //example:hello_world_gl --config=clang --sandbox_base=/dev/shm \
|
bazelisk build //example:hello_world_gl --config=clang --sandbox_base=/dev/shm \
|
||||||
|
@ -5,19 +5,109 @@ generated_cc_atom(
|
|||||||
srcs = ["StencilAndFillPathRenderer.cpp"],
|
srcs = ["StencilAndFillPathRenderer.cpp"],
|
||||||
visibility = ["//:__subpackages__"],
|
visibility = ["//:__subpackages__"],
|
||||||
deps = [
|
deps = [
|
||||||
"//experimental/graphite/src:DrawWriter_hdr",
|
":CoverBoundsRenderStep_hdr",
|
||||||
|
":MiddleOutFanRenderStep_hdr",
|
||||||
|
":TessellateCurvesRenderStep_hdr",
|
||||||
|
":TessellateWedgesRenderStep_hdr",
|
||||||
"//experimental/graphite/src:Renderer_hdr",
|
"//experimental/graphite/src:Renderer_hdr",
|
||||||
"//experimental/graphite/src:UniformManager_hdr",
|
"//include/core:SkPathTypes_hdr",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
generated_cc_atom(
|
||||||
|
name = "CoverBoundsRenderStep_hdr",
|
||||||
|
hdrs = ["CoverBoundsRenderStep.h"],
|
||||||
|
visibility = ["//:__subpackages__"],
|
||||||
|
deps = ["//experimental/graphite/src:Renderer_hdr"],
|
||||||
|
)
|
||||||
|
|
||||||
|
generated_cc_atom(
|
||||||
|
name = "CoverBoundsRenderStep_src",
|
||||||
|
srcs = ["CoverBoundsRenderStep.cpp"],
|
||||||
|
visibility = ["//:__subpackages__"],
|
||||||
|
deps = [
|
||||||
|
":CoverBoundsRenderStep_hdr",
|
||||||
|
":StencilAndCoverDSS_hdr",
|
||||||
|
"//experimental/graphite/src:DrawWriter_hdr",
|
||||||
|
"//experimental/graphite/src/geom:Shape_hdr",
|
||||||
|
"//experimental/graphite/src/geom:Transform_graphite_hdr",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
generated_cc_atom(
|
||||||
|
name = "MiddleOutFanRenderStep_hdr",
|
||||||
|
hdrs = ["MiddleOutFanRenderStep.h"],
|
||||||
|
visibility = ["//:__subpackages__"],
|
||||||
|
deps = ["//experimental/graphite/src:Renderer_hdr"],
|
||||||
|
)
|
||||||
|
|
||||||
|
generated_cc_atom(
|
||||||
|
name = "MiddleOutFanRenderStep_src",
|
||||||
|
srcs = ["MiddleOutFanRenderStep.cpp"],
|
||||||
|
visibility = ["//:__subpackages__"],
|
||||||
|
deps = [
|
||||||
|
":MiddleOutFanRenderStep_hdr",
|
||||||
|
":StencilAndCoverDSS_hdr",
|
||||||
|
"//experimental/graphite/src:DrawWriter_hdr",
|
||||||
"//experimental/graphite/src/geom:Shape_hdr",
|
"//experimental/graphite/src/geom:Shape_hdr",
|
||||||
"//experimental/graphite/src/geom:Transform_graphite_hdr",
|
"//experimental/graphite/src/geom:Transform_graphite_hdr",
|
||||||
"//include/core:SkPathTypes_hdr",
|
|
||||||
"//include/core:SkRect_hdr",
|
|
||||||
"//src/core:SkUniformData_hdr",
|
|
||||||
"//src/gpu:BufferWriter_hdr",
|
|
||||||
"//src/gpu/tessellate:AffineMatrix_hdr",
|
|
||||||
"//src/gpu/tessellate:MiddleOutPolygonTriangulator_hdr",
|
"//src/gpu/tessellate:MiddleOutPolygonTriangulator_hdr",
|
||||||
|
"//src/gpu/tessellate:PathTessellator_hdr",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
generated_cc_atom(
|
||||||
|
name = "StencilAndCoverDSS_hdr",
|
||||||
|
hdrs = ["StencilAndCoverDSS.h"],
|
||||||
|
visibility = ["//:__subpackages__"],
|
||||||
|
deps = ["//experimental/graphite/src:DrawTypes_hdr"],
|
||||||
|
)
|
||||||
|
|
||||||
|
generated_cc_atom(
|
||||||
|
name = "TessellateCurvesRenderStep_hdr",
|
||||||
|
hdrs = ["TessellateCurvesRenderStep.h"],
|
||||||
|
visibility = ["//:__subpackages__"],
|
||||||
|
deps = ["//experimental/graphite/src:Renderer_hdr"],
|
||||||
|
)
|
||||||
|
|
||||||
|
generated_cc_atom(
|
||||||
|
name = "TessellateCurvesRenderStep_src",
|
||||||
|
srcs = ["TessellateCurvesRenderStep.cpp"],
|
||||||
|
visibility = ["//:__subpackages__"],
|
||||||
|
deps = [
|
||||||
|
":StencilAndCoverDSS_hdr",
|
||||||
|
":TessellateCurvesRenderStep_hdr",
|
||||||
|
"//experimental/graphite/src:DrawWriter_hdr",
|
||||||
|
"//experimental/graphite/src/geom:Shape_hdr",
|
||||||
|
"//experimental/graphite/src/geom:Transform_graphite_hdr",
|
||||||
|
"//src/gpu/tessellate:AffineMatrix_hdr",
|
||||||
"//src/gpu/tessellate:PatchWriter_hdr",
|
"//src/gpu/tessellate:PatchWriter_hdr",
|
||||||
"//src/gpu/tessellate:PathCurveTessellator_hdr",
|
"//src/gpu/tessellate:PathCurveTessellator_hdr",
|
||||||
"//src/gpu/tessellate:PathTessellator_hdr",
|
"//src/gpu/tessellate:PathTessellator_hdr",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
generated_cc_atom(
|
||||||
|
name = "TessellateWedgesRenderStep_hdr",
|
||||||
|
hdrs = ["TessellateWedgesRenderStep.h"],
|
||||||
|
visibility = ["//:__subpackages__"],
|
||||||
|
deps = ["//experimental/graphite/src:Renderer_hdr"],
|
||||||
|
)
|
||||||
|
|
||||||
|
generated_cc_atom(
|
||||||
|
name = "TessellateWedgesRenderStep_src",
|
||||||
|
srcs = ["TessellateWedgesRenderStep.cpp"],
|
||||||
|
visibility = ["//:__subpackages__"],
|
||||||
|
deps = [
|
||||||
|
":StencilAndCoverDSS_hdr",
|
||||||
|
":TessellateWedgesRenderStep_hdr",
|
||||||
|
"//experimental/graphite/src:DrawWriter_hdr",
|
||||||
|
"//experimental/graphite/src/geom:Shape_hdr",
|
||||||
|
"//experimental/graphite/src/geom:Transform_graphite_hdr",
|
||||||
|
"//src/gpu/tessellate:AffineMatrix_hdr",
|
||||||
|
"//src/gpu/tessellate:MidpointContourParser_hdr",
|
||||||
|
"//src/gpu/tessellate:PatchWriter_hdr",
|
||||||
|
"//src/gpu/tessellate:PathTessellator_hdr",
|
||||||
|
"//src/gpu/tessellate:PathWedgeTessellator_hdr",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
@ -8486,6 +8486,8 @@ generated_cc_atom(
|
|||||||
"//include/core:SkBitmap_hdr",
|
"//include/core:SkBitmap_hdr",
|
||||||
"//include/core:SkCanvas_hdr",
|
"//include/core:SkCanvas_hdr",
|
||||||
"//include/core:SkColor_hdr",
|
"//include/core:SkColor_hdr",
|
||||||
|
"//include/core:SkFontArguments_hdr",
|
||||||
|
"//include/core:SkFontMgr_hdr",
|
||||||
"//include/core:SkFontTypes_hdr",
|
"//include/core:SkFontTypes_hdr",
|
||||||
"//include/core:SkFont_hdr",
|
"//include/core:SkFont_hdr",
|
||||||
"//include/core:SkImageInfo_hdr",
|
"//include/core:SkImageInfo_hdr",
|
||||||
|
@ -99,6 +99,7 @@ generated_cc_atom(
|
|||||||
visibility = ["//:__subpackages__"],
|
visibility = ["//:__subpackages__"],
|
||||||
deps = [
|
deps = [
|
||||||
":AffineMatrix_hdr",
|
":AffineMatrix_hdr",
|
||||||
|
":MidpointContourParser_hdr",
|
||||||
":PatchWriter_hdr",
|
":PatchWriter_hdr",
|
||||||
":PathCurveTessellator_hdr",
|
":PathCurveTessellator_hdr",
|
||||||
":PathWedgeTessellator_hdr",
|
":PathWedgeTessellator_hdr",
|
||||||
@ -223,3 +224,13 @@ generated_cc_atom(
|
|||||||
"//include/private:SkFloatingPoint_hdr",
|
"//include/private:SkFloatingPoint_hdr",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
generated_cc_atom(
|
||||||
|
name = "MidpointContourParser_hdr",
|
||||||
|
hdrs = ["MidpointContourParser.h"],
|
||||||
|
visibility = ["//:__subpackages__"],
|
||||||
|
deps = [
|
||||||
|
"//include/core:SkPath_hdr",
|
||||||
|
"//src/core:SkPathPriv_hdr",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
@ -289,6 +289,7 @@ generated_cc_atom(
|
|||||||
"//include/core:SkPath_hdr",
|
"//include/core:SkPath_hdr",
|
||||||
"//include/core:SkPictureRecorder_hdr",
|
"//include/core:SkPictureRecorder_hdr",
|
||||||
"//include/effects:SkGradientShader_hdr",
|
"//include/effects:SkGradientShader_hdr",
|
||||||
|
"//include/pathops:SkPathOps_hdr",
|
||||||
"//include/private:SkColorData_hdr",
|
"//include/private:SkColorData_hdr",
|
||||||
"//include/private:SkTo_hdr",
|
"//include/private:SkTo_hdr",
|
||||||
"//src/core:SkFDot6_hdr",
|
"//src/core:SkFDot6_hdr",
|
||||||
|
1
third_party/BUILD.bazel
vendored
1
third_party/BUILD.bazel
vendored
@ -2222,6 +2222,7 @@ HARFBUZZ_SRCS = [
|
|||||||
"externals/harfbuzz/src/hb-buffer-deserialize-json.hh",
|
"externals/harfbuzz/src/hb-buffer-deserialize-json.hh",
|
||||||
"externals/harfbuzz/src/hb-buffer-deserialize-text.hh",
|
"externals/harfbuzz/src/hb-buffer-deserialize-text.hh",
|
||||||
"externals/harfbuzz/src/hb-buffer-serialize.cc",
|
"externals/harfbuzz/src/hb-buffer-serialize.cc",
|
||||||
|
"externals/harfbuzz/src/hb-buffer-verify.cc",
|
||||||
"externals/harfbuzz/src/hb-buffer.cc",
|
"externals/harfbuzz/src/hb-buffer.cc",
|
||||||
"externals/harfbuzz/src/hb-buffer.hh",
|
"externals/harfbuzz/src/hb-buffer.hh",
|
||||||
"externals/harfbuzz/src/hb-cache.hh",
|
"externals/harfbuzz/src/hb-cache.hh",
|
||||||
|
@ -8,6 +8,7 @@ generated_cc_atom(
|
|||||||
":skqp_hdr",
|
":skqp_hdr",
|
||||||
"//include/core:SkStream_hdr",
|
"//include/core:SkStream_hdr",
|
||||||
"//include/private:SkTo_hdr",
|
"//include/private:SkTo_hdr",
|
||||||
|
"//src/utils:SkOSPath_hdr",
|
||||||
"//tools:ResourceFactory_hdr",
|
"//tools:ResourceFactory_hdr",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@ -26,6 +27,7 @@ generated_cc_atom(
|
|||||||
":skqp_hdr",
|
":skqp_hdr",
|
||||||
"//include/core:SkData_hdr",
|
"//include/core:SkData_hdr",
|
||||||
"//src/core:SkOSFile_hdr",
|
"//src/core:SkOSFile_hdr",
|
||||||
|
"//src/utils:SkOSPath_hdr",
|
||||||
"//tools:Resources_hdr",
|
"//tools:Resources_hdr",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user