Edit
kc3-lang/angle/DEPS
Branch :
-
Show log
Commit
-
Author :
Jamie Madill
Date : 2018-12-17 14:04:10
Hash : 720ca449
Message : Pass GN header visibility check. This fixes a few things: * removes includes that weren't supposed to be present * scopes some compiler code into white_box_perftests * makes version.h/commit and angle_common id more visible * roll zlib to a version that passes check This should help prevent build problems from popping up in the downstream Chromium build. We could also potentially look at including gn check in our CQ recipe. Bug: chromium:915429 Change-Id: I350f543e16de13c84eb2c43260f4966d47185114 Reviewed-on: https://chromium-review.googlesource.com/c/1380771 Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
- DEPS
-
vars = { 'android_git': 'https://android.googlesource.com', 'chromium_git': 'https://chromium.googlesource.com', # This variable is set on the Chrome infra for compatiblity with gclient. 'angle_root': '.', # This variable is overrided in Chromium's DEPS file. 'build_with_chromium': False, # Current revision of dEQP. 'deqp_revision': 'f5637d67a00a1081a13008bb8dc93b2616c935e2', # Current revision of glslang, the Khronos SPIRV compiler. 'glslang_revision': 'f9edfdab0e872c674e0a80e083239aa9637871ba', # Current revision fo the SPIRV-Headers Vulkan support library. 'spirv_headers_revision': 'd5b2e1255f706ce1f88812217e9a554f299848af', # Current revision of SPIRV-Tools for Vulkan. 'spirv_tools_revision': 'd73b9d8dfbf7761e3fde323af00ec18ebfc0020c', # Current revision of Khronos Vulkan-Headers. 'vulkan_headers_revision': 'b65941cc4b2b43b74de00534d110b581c52c394b', # Current revision of Khronos Vulkan-Loader. 'vulkan_loader_revision': '2aa6dcc10189f7700824bc5e21120beeff013c3a', # Current revision of Khronos Vulkan-Tools. 'vulkan_tools_revision': '2e8d601de618eddf2bab8597fd140b2824a060b2', # Current revision of Khronos Vulkan-ValidationLayers. 'vulkan_validation_revision': '0fa2823fa693cc22afaa6e6c6d34aadb97104a2d', } deps = { '{angle_root}/build': { 'url': '{chromium_git}/chromium/src/build.git@2fb6537bf59c9c9a736997b8bd888ca0ecf54322', 'condition': 'not build_with_chromium', }, '{angle_root}/buildtools': { 'url': '{chromium_git}/chromium/buildtools.git@24ebce4578745db15274e180da1938ebc1358243', 'condition': 'not build_with_chromium', }, '{angle_root}/testing': { 'url': '{chromium_git}/chromium/src/testing@7bdda3c6577f21fd0ec986a0383ecfce28f5d761', 'condition': 'not build_with_chromium', }, # Cherry is a dEQP management GUI written in Go. We use it for viewing test results. '{angle_root}/third_party/cherry': { 'url': '{android_git}/platform/external/cherry@4f8fb08d33ca5ff05a1c638f04c85bbb8d8b52cc', 'condition': 'not build_with_chromium', }, '{angle_root}/third_party/deqp/src': { 'url': '{android_git}/platform/external/deqp@{deqp_revision}', }, '{angle_root}/third_party/glslang/src': { 'url': '{chromium_git}/external/github.com/KhronosGroup/glslang@{glslang_revision}', }, '{angle_root}/third_party/googletest/src': { 'url': '{chromium_git}/external/github.com/google/googletest.git@d5932506d6eed73ac80b9bcc47ed723c8c74eb1e', 'condition': 'not build_with_chromium', }, '{angle_root}/third_party/libpng/src': { 'url': '{android_git}/platform/external/libpng@094e181e79a3d6c23fd005679025058b7df1ad6c', 'condition': 'not build_with_chromium', }, '{angle_root}/third_party/jsoncpp': { 'url': '{chromium_git}/chromium/src/third_party/jsoncpp@fd0ac8ce63a47e99b71a58f1489136fbb19c9137', }, '{angle_root}/third_party/jsoncpp/source': { 'url' : '{chromium_git}/external/github.com/open-source-parsers/jsoncpp@f572e8e42e22cfcf5ab0aea26574f408943edfa4' }, '{angle_root}/third_party/spirv-headers/src': { 'url': '{android_git}/platform/external/shaderc/spirv-headers@{spirv_headers_revision}', 'condition': 'not build_with_chromium', }, '{angle_root}/third_party/spirv-tools/src': { 'url': '{android_git}/platform/external/shaderc/spirv-tools@{spirv_tools_revision}', 'condition': 'not build_with_chromium', }, '{angle_root}/third_party/vulkan-headers/src': { 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Headers@{vulkan_headers_revision}', }, '{angle_root}/third_party/vulkan-loader/src': { 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Loader@{vulkan_loader_revision}', }, '{angle_root}/third_party/vulkan-tools/src': { 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-Tools@{vulkan_tools_revision}', }, '{angle_root}/third_party/vulkan-validation-layers/src': { 'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@{vulkan_validation_revision}', }, '{angle_root}/third_party/zlib': { 'url': '{chromium_git}/chromium/src/third_party/zlib@f95aeb0fa7f136ef4a457a6d9ba6f3c2701a444b', 'condition': 'not build_with_chromium', }, '{angle_root}/tools/clang': { 'url': '{chromium_git}/chromium/src/tools/clang.git@1d879cee563167a2b18baffb096cf9e29f2f9376', 'condition': 'not build_with_chromium', }, } hooks = [ # Pull clang-format binaries using checked-in hashes. { 'name': 'clang_format_win', 'pattern': '.', 'condition': 'host_os == "win" and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=win32', '--no_auth', '--bucket', 'chromium-clang-format', '-s', '{angle_root}/buildtools/win/clang-format.exe.sha1', ], }, { 'name': 'clang_format_mac', 'pattern': '.', 'condition': 'host_os == "mac" and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=darwin', '--no_auth', '--bucket', 'chromium-clang-format', '-s', '{angle_root}/buildtools/mac/clang-format.sha1', ], }, { 'name': 'clang_format_linux', 'pattern': '.', 'condition': 'host_os == "linux" and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=linux*', '--no_auth', '--bucket', 'chromium-clang-format', '-s', '{angle_root}/buildtools/linux64/clang-format.sha1', ], }, # Pull GN binaries using checked-in hashes. { 'name': 'gn_win', 'pattern': '.', 'condition': 'host_os == "win" and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=win32', '--no_auth', '--bucket', 'chromium-gn', '-s', '{angle_root}/buildtools/win/gn.exe.sha1', ], }, { 'name': 'gn_mac', 'pattern': '.', 'condition': 'host_os == "mac" and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=darwin', '--no_auth', '--bucket', 'chromium-gn', '-s', '{angle_root}/buildtools/mac/gn.sha1', ], }, { 'name': 'gn_linux64', 'pattern': '.', 'condition': 'host_os == "linux" and not build_with_chromium', 'action': [ 'download_from_google_storage', '--no_resume', '--platform=linux*', '--no_auth', '--bucket', 'chromium-gn', '-s', '{angle_root}/buildtools/linux64/gn.sha1', ], }, { 'name': 'sysroot_x86', 'pattern': '.', 'condition': 'checkout_linux and ((checkout_x86 or checkout_x64) and not build_with_chromium)', 'action': ['python', '{angle_root}/build/linux/sysroot_scripts/install-sysroot.py', '--arch=x86'], }, { 'name': 'sysroot_x64', 'pattern': '.', 'condition': 'checkout_linux and (checkout_x64 and not build_with_chromium)', 'action': ['python', '{angle_root}/build/linux/sysroot_scripts/install-sysroot.py', '--arch=x64'], }, { # Update the Windows toolchain if necessary. Must run before 'clang' below. 'name': 'win_toolchain', 'pattern': '.', 'condition': 'checkout_win and not build_with_chromium', 'action': ['python', '{angle_root}/build/vs_toolchain.py', 'update', '--force'], }, { # Note: On Win, this should run after win_toolchain, as it may use it. 'name': 'clang', 'pattern': '.', 'action': ['python', '{angle_root}/tools/clang/scripts/update.py'], 'condition': 'not build_with_chromium', }, { # Update LASTCHANGE. 'name': 'lastchange', 'pattern': '.', 'condition': 'not build_with_chromium', 'action': ['python', '{angle_root}/build/util/lastchange.py', '-o', '{angle_root}/build/util/LASTCHANGE'], }, # Pull rc binaries using checked-in hashes. { 'name': 'rc_win', 'pattern': '.', 'condition': 'checkout_win and (host_os == "win" and not build_with_chromium)', 'action': [ 'download_from_google_storage', '--no_resume', '--no_auth', '--bucket', 'chromium-browser-clang/rc', '-s', '{angle_root}/build/toolchain/win/rc/win/rc.exe.sha1', ], }, ] recursedeps = [ # buildtools provides clang_format. '{angle_root}/buildtools', ]