66efe821b7
Abseil (which is a DEP of dawn) has BUILD.bazel files, but the ones in the chromium third_party version are broken because there are some files that are not included in the chromium clone (fork?). For example, internal/thread_annotations.h [1], which is not found in [2]. We want to be able to use existing BUILD.bazel rules as much as possible when building Skia with Bazel, so this changes the repo we sync abseil to be the one on GitHub (the source of truth). The git revision I went with was the most recent one and appeared to work locally. I ran this idea by bajones@, who added the DEP originally in [3], and got approval. [1] https://github.com/abseil/abseil-cpp/blob/master/absl/base/internal/thread_annotations.h [2] https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp/+/refs/heads/main/absl/base/internal/ [3] https://skia-review.googlesource.com/c/skia/+/451638 Change-Id: I1a61907a86de08cbddc395bf261426237788c6a5 Bug: skia:12541 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/520696 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
72 lines
6.2 KiB
Python
72 lines
6.2 KiB
Python
use_relative_paths = True
|
|
|
|
vars = {
|
|
"checkout_chromium": False,
|
|
|
|
# Three lines of non-changing comments so that
|
|
# the commit queue can handle CLs rolling different
|
|
# dependencies without interference from each other.
|
|
'sk_tool_revision': 'git_revision:6c36b0448afbfcbb8707afaf9fd0d2c0cb6994fc',
|
|
}
|
|
|
|
deps = {
|
|
"buildtools" : "https://chromium.googlesource.com/chromium/src/buildtools.git@b138e6ce86ae843c42a1a08f37903207bebcca75",
|
|
"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@7eb7596abf0b24518334f43fc1396ebfffe6e27c",
|
|
"third_party/externals/brotli" : "https://skia.googlesource.com/external/github.com/google/brotli.git@e61745a6b7add50d380cfd7d3883dd6c62fc2c71",
|
|
"third_party/externals/d3d12allocator" : "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git@169895d529dfce00390a20e69c2f516066fe7a3b",
|
|
# Dawn requires jinja2 and markupsafe for the code generator, tint for SPIRV compilation, and abseil for string formatting.
|
|
# When the Dawn revision is updated these should be updated from the Dawn DEPS as well.
|
|
"third_party/externals/dawn" : "https://dawn.googlesource.com/dawn.git@0146d3e31d86d6fb6959d3066d14fd92f32048b5",
|
|
"third_party/externals/jinja2" : "https://chromium.googlesource.com/chromium/src/third_party/jinja2@ee69aa00ee8536f61db6a451f3858745cf587de6",
|
|
"third_party/externals/markupsafe" : "https://chromium.googlesource.com/chromium/src/third_party/markupsafe@0944e71f4b2cb9a871bcbe353f95e889b64a611a",
|
|
"third_party/externals/tint" : "https://dawn.googlesource.com/tint@b86895da5f7490e97e1326c04eb4aa1b7d62bb1d",
|
|
"third_party/externals/abseil-cpp" : "https://skia.googlesource.com/external/github.com/abseil/abseil-cpp.git@c5a424a2a21005660b182516eb7a079cd8021699",
|
|
"third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@c8d0c9b1d16bfda56f15165d39e0ffa360a11123",
|
|
"third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae",
|
|
"third_party/externals/emsdk" : "https://skia.googlesource.com/external/github.com/emscripten-core/emsdk.git@fc645b7626ebf86530dbd82fbece74d457e7ae07",
|
|
"third_party/externals/expat" : "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git@a28238bdeebc087071777001245df1876a11f5ee",
|
|
"third_party/externals/freetype" : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@034e5dbf92ea3a7ea7c9322e47a3a50ff23f7b55",
|
|
"third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@8d1b000a3edc90c12267b836b4ef3f81c0e53edc",
|
|
"third_party/externals/highway" : "https://chromium.googlesource.com/external/github.com/google/highway.git@424360251cdcfc314cfc528f53c872ecd63af0f0",
|
|
"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@a0718d4f121727e30b8d52c7a189ebf5ab52421f",
|
|
"third_party/externals/imgui" : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@55d35d8387c15bf0cfd71861df67af8cfbda7456",
|
|
"third_party/externals/libgifcodec" : "https://skia.googlesource.com/libgifcodec@fd59fa92a0c86788dcdd84d091e1ce81eda06a77",
|
|
"third_party/externals/libjpeg-turbo" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@02959c3ee17abacfd1339ec22ea93301292ffd56",
|
|
"third_party/externals/libjxl" : "https://chromium.googlesource.com/external/gitlab.com/wg1/jpeg-xl.git@a205468bc5d3a353fb15dae2398a101dff52f2d3",
|
|
"third_party/externals/libpng" : "https://skia.googlesource.com/third_party/libpng.git@386707c6d19b974ca2e3db7f5c61873813c6fe44",
|
|
"third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@69c7f16111ec582bf1e7cb4d0d4f8d127e28a715",
|
|
"third_party/externals/microhttpd" : "https://android.googlesource.com/platform/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d",
|
|
"third_party/externals/oboe" : "https://chromium.googlesource.com/external/github.com/google/oboe.git@b02a12d1dd821118763debec6b83d00a8a0ee419",
|
|
"third_party/externals/opengl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry@14b80ebeab022b2c78f84a573f01028c96075553",
|
|
"third_party/externals/piex" : "https://android.googlesource.com/platform/external/piex.git@bb217acdca1cc0c16b704669dd6f91a1b509c406",
|
|
"third_party/externals/sfntly" : "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git@b55ff303ea2f9e26702b514cf6a3196a2e3e2974",
|
|
"third_party/externals/spirv-cross" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross@0e2880ab990e79ce6cc8c79c219feda42d98b1e8",
|
|
"third_party/externals/spirv-headers" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git@814e728b30ddd0f4509233099a3ad96fd4318c07",
|
|
"third_party/externals/spirv-tools" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git@4b092d2ab81854e61632bdd1e658907f0071c37e",
|
|
"third_party/externals/swiftshader" : "https://swiftshader.googlesource.com/SwiftShader@c27e99245d423648fe5f0eafa73d49ce7b53d201",
|
|
#"third_party/externals/v8" : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4",
|
|
"third_party/externals/wuffs" : "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git@600cd96cf47788ee3a74b40a6028b035c9fd6a61",
|
|
"third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@c876c8f87101c5a75f6014b0f832499afeb65b73",
|
|
|
|
"../src": {
|
|
"url": "https://chromium.googlesource.com/chromium/src.git@8fa4c936281662f1ad1c97ffece6000052108b6a",
|
|
"condition": "checkout_chromium",
|
|
},
|
|
|
|
'bin': {
|
|
'packages': [
|
|
{
|
|
'package': 'skia/tools/sk/${{platform}}',
|
|
'version': Var('sk_tool_revision'),
|
|
}
|
|
],
|
|
'dep_type': 'cipd',
|
|
},
|
|
}
|
|
|
|
recursedeps = [
|
|
"../src",
|
|
]
|
|
|
|
gclient_gn_args_from = 'src'
|