encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Roll GN 

Also fix a gn check failure with the new GN.

Bug: None
Change-Id: I0686dd5de7fc5804fbbe79f19db413cc67fa0aae
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/72484
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Loko Kung <lokokung@google.com>
Commit-Queue: Loko Kung <lokokung@google.com>
This commit is contained in:
Corentin Wallez 2021-12-13 15:24:55 +00:00 committed by Dawn LUCI CQ
parent b320f17000
commit 88d5e07d73
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DEPS
View File

@ -12,6 +12,7 @@ vars = {
'dawn_node': False, # Also fetches dependencies required for building NodeJS bindings. 'dawn_node': False, # Also fetches dependencies required for building NodeJS bindings.
'dawn_cmake_version': 'version:3.13.5', 'dawn_cmake_version': 'version:3.13.5',
'dawn_cmake_win32_sha1': 'b106d66bcdc8a71ea2cdf5446091327bfdb1bcd7', 'dawn_cmake_win32_sha1': 'b106d66bcdc8a71ea2cdf5446091327bfdb1bcd7',
'dawn_gn_version': 'git_revision:fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f',
'dawn_go_version': 'version:1.16', 'dawn_go_version': 'version:1.16',
} }
@ -33,7 +34,7 @@ deps = {
'buildtools/linux64': { 'buildtools/linux64': {
'packages': [{ 'packages': [{
'package': 'gn/gn/linux-amd64', 'package': 'gn/gn/linux-amd64',
'version': 'git_revision:dfcbc6fed0a8352696f92d67ccad54048ad182b3', 'version': Var('dawn_gn_version'),
}], }],
'dep_type': 'cipd', 'dep_type': 'cipd',
'condition': 'dawn_standalone and host_os == "linux"', 'condition': 'dawn_standalone and host_os == "linux"',
@ -41,7 +42,7 @@ deps = {
'buildtools/mac': { 'buildtools/mac': {
'packages': [{ 'packages': [{
'package': 'gn/gn/mac-${{arch}}', 'package': 'gn/gn/mac-${{arch}}',
'version': 'git_revision:dfcbc6fed0a8352696f92d67ccad54048ad182b3', 'version': Var('dawn_gn_version'),
}], }],
'dep_type': 'cipd', 'dep_type': 'cipd',
'condition': 'dawn_standalone and host_os == "mac"', 'condition': 'dawn_standalone and host_os == "mac"',
@ -49,7 +50,7 @@ deps = {
'buildtools/win': { 'buildtools/win': {
'packages': [{ 'packages': [{
'package': 'gn/gn/windows-amd64', 'package': 'gn/gn/windows-amd64',
'version': 'git_revision:dfcbc6fed0a8352696f92d67ccad54048ad182b3', 'version': Var('dawn_gn_version'),
}], }],
'dep_type': 'cipd', 'dep_type': 'cipd',
'condition': 'dawn_standalone and host_os == "win"', 'condition': 'dawn_standalone and host_os == "win"',

5
src/common/BUILD.gn
View File

@ -91,7 +91,10 @@ config("dawn_internal") {
# Only internal Dawn targets can use this config, this means only targets in # Only internal Dawn targets can use this config, this means only targets in
# this BUILD.gn file and related subdirs. # this BUILD.gn file and related subdirs.
visibility = [ "../*" ] visibility = [
"../*",
"../../examples/*",
]
cflags = [] cflags = []
if (is_clang) { if (is_clang) {