Skip to content

A
angle
Commit 8ae09b0e by Edward Lemur Committed by Commit Bot
Options

Make DEPS file compatible with Chromium.

Rename 'root' to 'angle_root' and add conditions to not sync dependencies when building with Chromium. Bug: 782846 Change-Id: I250609ad0b5b8cad606075baf6dd6ca4e968a5b6 Reviewed-on: https://chromium-review.googlesource.com/1082922 Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 6b600645
Showing with 95 additions and 52 deletions
DEPS
...@@ -3,53 +3,94 @@ vars = { ...@@ -3,53 +3,94 @@ vars = {
'chromium_git': 'https://chromium.googlesource.com', 'chromium_git': 'https://chromium.googlesource.com',
# This variable is set on the Chrome infra for compatiblity with gclient. # This variable is set on the Chrome infra for compatiblity with gclient.
'root': '.', 'angle_root': '.',
# This variable is overrided in Chromium's DEPS file.
'build_with_chromium': False,
# Current revision of dEQP.
'deqp_revision': '5bc346ba2d5465a2e6094e254f12b1586fd0097f',
# Current revision of glslang, the Khronos SPIRV compiler.
'glslang_revision': '2edde6665d9a56ead5ea0e55b4e64d9a803e6164',
# Current revision fo the SPIRV-Headers Vulkan support library.
'spirv_headers_revision': '98b01515724c428d0f0a5d01deffcce0f5f5e61c',
# Current revision of SPIRV-Tools for Vulkan.
'spirv_tools_revision': '9996173f363729b3a97309685dbd4d78547a63a7',
# Current revision of the Vulkan Validation Layers SDK.
'vulkan_revision': '25d5884746a2de7b51a8ef3ec88e1cd8066460e8',
} }
deps = { deps = {
'{root}/build': '{angle_root}/build': {
'{chromium_git}/chromium/src/build.git@b944b99e72923c5a6699235ed858e725db21f81f', 'url': '{chromium_git}/chromium/src/build.git@b944b99e72923c5a6699235ed858e725db21f81f',
'condition': 'not build_with_chromium',
},
'{root}/buildtools': '{angle_root}/buildtools': {
'{chromium_git}/chromium/buildtools.git@94288c26d2ffe3aec9848c147839afee597acefd', 'url': '{chromium_git}/chromium/buildtools.git@94288c26d2ffe3aec9848c147839afee597acefd',
'condition': 'not build_with_chromium',
},
'{root}/testing': '{angle_root}/testing': {
'{chromium_git}/chromium/src/testing@4d706fd80be9e8989aec5235540e7b46d0672826', 'url': '{chromium_git}/chromium/src/testing@4d706fd80be9e8989aec5235540e7b46d0672826',
'condition': 'not build_with_chromium',
},
# Cherry is a dEQP management GUI written in Go. We use it for viewing test results. # Cherry is a dEQP management GUI written in Go. We use it for viewing test results.
'{root}/third_party/cherry': '{angle_root}/third_party/cherry': {
'{android_git}/platform/external/cherry@4f8fb08d33ca5ff05a1c638f04c85bbb8d8b52cc', 'url': '{android_git}/platform/external/cherry@4f8fb08d33ca5ff05a1c638f04c85bbb8d8b52cc',
'condition': 'not build_with_chromium',
},
'{root}/third_party/deqp/src': '{angle_root}/third_party/deqp/src': {
'{android_git}/platform/external/deqp@5bc346ba2d5465a2e6094e254f12b1586fd0097f', 'url': '{android_git}/platform/external/deqp@{deqp_revision}',
},
'{root}/third_party/glslang/src': '{angle_root}/third_party/glslang/src': {
'{android_git}/platform/external/shaderc/glslang@2edde6665d9a56ead5ea0e55b4e64d9a803e6164', 'url': '{android_git}/platform/external/shaderc/glslang@2edde6665d9a56ead5ea0e55b4e64d9a803e6164',
},
'{root}/third_party/googletest/src': '{angle_root}/third_party/googletest/src': {
'{chromium_git}/external/github.com/google/googletest.git@145d05750b15324899473340c8dd5af50d125d33', 'url': '{chromium_git}/external/github.com/google/googletest.git@145d05750b15324899473340c8dd5af50d125d33',
'condition': 'not build_with_chromium',
},
'{root}/third_party/libpng/src': '{angle_root}/third_party/libpng/src': {
'{android_git}/platform/external/libpng@094e181e79a3d6c23fd005679025058b7df1ad6c', 'url': '{android_git}/platform/external/libpng@094e181e79a3d6c23fd005679025058b7df1ad6c',
'condition': 'not build_with_chromium',
},
'{root}/third_party/spirv-headers/src': '{angle_root}/third_party/spirv-headers/src': {
'{android_git}/platform/external/shaderc/spirv-headers@98b01515724c428d0f0a5d01deffcce0f5f5e61c', 'url': '{android_git}/platform/external/shaderc/spirv-headers@98b01515724c428d0f0a5d01deffcce0f5f5e61c',
},
'{root}/third_party/spirv-tools/src': '{angle_root}/third_party/spirv-tools/src': {
'{android_git}/platform/external/shaderc/spirv-tools@9996173f363729b3a97309685dbd4d78547a63a7', 'url': '{android_git}/platform/external/shaderc/spirv-tools@9996173f363729b3a97309685dbd4d78547a63a7',
},
'{root}/third_party/vulkan-validation-layers/src': '{angle_root}/third_party/vulkan-validation-layers/src': {
'{android_git}/platform/external/vulkan-validation-layers@25d5884746a2de7b51a8ef3ec88e1cd8066460e8', 'url': '{android_git}/platform/external/vulkan-validation-layers@25d5884746a2de7b51a8ef3ec88e1cd8066460e8',
},
'{root}/third_party/zlib': '{angle_root}/third_party/zlib': {
'{chromium_git}/chromium/src/third_party/zlib@da0819d6c816a61be6fcb2fcf9b74246f0f8b808', 'url': '{chromium_git}/chromium/src/third_party/zlib@da0819d6c816a61be6fcb2fcf9b74246f0f8b808',
'condition': 'not build_with_chromium',
},
'{root}/tools/clang': '{angle_root}/tools/clang': {
'{chromium_git}/chromium/src/tools/clang.git@c893c7eec4706f8c7fc244ee254b1dadd8f8d158', 'url': '{chromium_git}/chromium/src/tools/clang.git@c893c7eec4706f8c7fc244ee254b1dadd8f8d158',
'condition': 'not build_with_chromium',
},
'{root}/tools/gyp': '{angle_root}/tools/gyp': {
'{chromium_git}/external/gyp@4d467626b0b9f59a85fb81ca4d7ea9eca99b9d8f', 'url': '{chromium_git}/external/gyp@4d467626b0b9f59a85fb81ca4d7ea9eca99b9d8f',
'condition': 'not build_with_chromium',
},
} }
hooks = [ hooks = [
...@@ -57,126 +98,128 @@ hooks = [ ...@@ -57,126 +98,128 @@ hooks = [
{ {
'name': 'clang_format_win', 'name': 'clang_format_win',
'pattern': '.', 'pattern': '.',
'condition': 'host_os == "win"', 'condition': 'host_os == "win" and not build_with_chromium',
'action': [ 'download_from_google_storage', 'action': [ 'download_from_google_storage',
'--no_resume', '--no_resume',
'--platform=win32', '--platform=win32',
'--no_auth', '--no_auth',
'--bucket', 'chromium-clang-format', '--bucket', 'chromium-clang-format',
'-s', '{root}/buildtools/win/clang-format.exe.sha1', '-s', '{angle_root}/buildtools/win/clang-format.exe.sha1',
], ],
}, },
{ {
'name': 'clang_format_mac', 'name': 'clang_format_mac',
'pattern': '.', 'pattern': '.',
'condition': 'host_os == "mac"', 'condition': 'host_os == "mac" and not build_with_chromium',
'action': [ 'download_from_google_storage', 'action': [ 'download_from_google_storage',
'--no_resume', '--no_resume',
'--platform=darwin', '--platform=darwin',
'--no_auth', '--no_auth',
'--bucket', 'chromium-clang-format', '--bucket', 'chromium-clang-format',
'-s', '{root}/buildtools/mac/clang-format.sha1', '-s', '{angle_root}/buildtools/mac/clang-format.sha1',
], ],
}, },
{ {
'name': 'clang_format_linux', 'name': 'clang_format_linux',
'pattern': '.', 'pattern': '.',
'condition': 'host_os == "linux"', 'condition': 'host_os == "linux" and not build_with_chromium',
'action': [ 'download_from_google_storage', 'action': [ 'download_from_google_storage',
'--no_resume', '--no_resume',
'--platform=linux*', '--platform=linux*',
'--no_auth', '--no_auth',
'--bucket', 'chromium-clang-format', '--bucket', 'chromium-clang-format',
'-s', '{root}/buildtools/linux64/clang-format.sha1', '-s', '{angle_root}/buildtools/linux64/clang-format.sha1',
], ],
}, },
# Pull GN binaries using checked-in hashes. # Pull GN binaries using checked-in hashes.
{ {
'name': 'gn_win', 'name': 'gn_win',
'pattern': '.', 'pattern': '.',
'condition': 'host_os == "win"', 'condition': 'host_os == "win" and not build_with_chromium',
'action': [ 'download_from_google_storage', 'action': [ 'download_from_google_storage',
'--no_resume', '--no_resume',
'--platform=win32', '--platform=win32',
'--no_auth', '--no_auth',
'--bucket', 'chromium-gn', '--bucket', 'chromium-gn',
'-s', '{root}/buildtools/win/gn.exe.sha1', '-s', '{angle_root}/buildtools/win/gn.exe.sha1',
], ],
}, },
{ {
'name': 'gn_mac', 'name': 'gn_mac',
'pattern': '.', 'pattern': '.',
'condition': 'host_os == "mac"', 'condition': 'host_os == "mac" and not build_with_chromium',
'action': [ 'download_from_google_storage', 'action': [ 'download_from_google_storage',
'--no_resume', '--no_resume',
'--platform=darwin', '--platform=darwin',
'--no_auth', '--no_auth',
'--bucket', 'chromium-gn', '--bucket', 'chromium-gn',
'-s', '{root}/buildtools/mac/gn.sha1', '-s', '{angle_root}/buildtools/mac/gn.sha1',
], ],
}, },
{ {
'name': 'gn_linux64', 'name': 'gn_linux64',
'pattern': '.', 'pattern': '.',
'condition': 'host_os == "linux"', 'condition': 'host_os == "linux" and not build_with_chromium',
'action': [ 'download_from_google_storage', 'action': [ 'download_from_google_storage',
'--no_resume', '--no_resume',
'--platform=linux*', '--platform=linux*',
'--no_auth', '--no_auth',
'--bucket', 'chromium-gn', '--bucket', 'chromium-gn',
'-s', '{root}/buildtools/linux64/gn.sha1', '-s', '{angle_root}/buildtools/linux64/gn.sha1',
], ],
}, },
{ {
'name': 'sysroot_x86', 'name': 'sysroot_x86',
'pattern': '.', 'pattern': '.',
'condition': 'checkout_linux and (checkout_x86 or checkout_x64)', 'condition': 'checkout_linux and ((checkout_x86 or checkout_x64) and not build_with_chromium)',
'action': ['python', '{root}/build/linux/sysroot_scripts/install-sysroot.py', 'action': ['python', '{angle_root}/build/linux/sysroot_scripts/install-sysroot.py',
'--arch=x86'], '--arch=x86'],
}, },
{ {
'name': 'sysroot_x64', 'name': 'sysroot_x64',
'pattern': '.', 'pattern': '.',
'condition': 'checkout_linux and checkout_x64', 'condition': 'checkout_linux and (checkout_x64 and not build_with_chromium)',
'action': ['python', '{root}/build/linux/sysroot_scripts/install-sysroot.py', 'action': ['python', '{angle_root}/build/linux/sysroot_scripts/install-sysroot.py',
'--arch=x64'], '--arch=x64'],
}, },
{ {
# Update the Windows toolchain if necessary. Must run before 'clang' below. # Update the Windows toolchain if necessary. Must run before 'clang' below.
'name': 'win_toolchain', 'name': 'win_toolchain',
'pattern': '.', 'pattern': '.',
'condition': 'checkout_win', 'condition': 'checkout_win and not build_with_chromium',
'action': ['python', '{root}/build/vs_toolchain.py', 'update', '--force'], 'action': ['python', '{angle_root}/build/vs_toolchain.py', 'update', '--force'],
}, },
{ {
# Note: On Win, this should run after win_toolchain, as it may use it. # Note: On Win, this should run after win_toolchain, as it may use it.
'name': 'clang', 'name': 'clang',
'pattern': '.', 'pattern': '.',
'action': ['python', '{root}/tools/clang/scripts/update.py'], 'action': ['python', '{angle_root}/tools/clang/scripts/update.py'],
'condition': 'not build_with_chromium',
}, },
# Pull rc binaries using checked-in hashes. # Pull rc binaries using checked-in hashes.
{ {
'name': 'rc_win', 'name': 'rc_win',
'pattern': '.', 'pattern': '.',
'condition': 'checkout_win and host_os == "win"', 'condition': 'checkout_win and (host_os == "win" and not build_with_chromium)',
'action': [ 'download_from_google_storage', 'action': [ 'download_from_google_storage',
'--no_resume', '--no_resume',
'--no_auth', '--no_auth',
'--bucket', 'chromium-browser-clang/rc', '--bucket', 'chromium-browser-clang/rc',
'-s', '{root}/build/toolchain/win/rc/win/rc.exe.sha1', '-s', '{angle_root}/build/toolchain/win/rc/win/rc.exe.sha1',
], ],
}, },
{ {
# A change to a .gyp, .gypi, or to GYP itself should run the generator. # A change to a .gyp, .gypi, or to GYP itself should run the generator.
'pattern': '.', 'pattern': '.',
'action': ['python', '{root}/gyp/gyp_angle'], 'action': ['python', '{angle_root}/gyp/gyp_angle'],
'condition': 'not build_with_chromium',
}, },
] ]
recursedeps = [ recursedeps = [
# buildtools provides clang_format. # buildtools provides clang_format.
'{root}/buildtools', '{angle_root}/buildtools',
] ]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment