commit a0bdba1dfc52914fa49798a29f833d0398e38709
author Corentin Wallez <cwallez@chromium.org> Thu Apr 01 23:42:23 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Thu Apr 01 23:42:23 2021 +0000
tree 6abe4fb4fc900eb7c59b8363047a52f89918eab9
parent 3e8f3f9609fb25f7e7f6a517c15aeca314eb446c

Make Dawn's Tint version visible when recursedepsing in Dawn

Bug: tint:700
Change-Id: I24b862822ca728afa7aebead53c8eb07e9cdc440
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/46622
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>

DEPS

diff --git a/DEPS b/DEPS
index 494f35b..8f15250 100644
--- a/DEPS
+++ b/DEPS
@@ -97,7 +97,6 @@
   # WGSL support
   'third_party/tint': {
     'url': '{dawn_git}/tint@b4275c870ec21ca1d55f086f6ee66306c5783a67',
-    'condition': 'dawn_standalone',
   },
 
   # GLFW for tests and samples

scripts/dawn_overrides_with_defaults.gni

diff --git a/scripts/dawn_overrides_with_defaults.gni b/scripts/dawn_overrides_with_defaults.gni
index 3693194..acb5a70 100644
--- a/scripts/dawn_overrides_with_defaults.gni
+++ b/scripts/dawn_overrides_with_defaults.gni
@@ -73,6 +73,6 @@
 }
 
 if (!defined(dawn_tint_dir)) {
-  # Default to Tint not being available.
-  dawn_tint_dir = ""
+  # Default to Tint being Dawn's DEPS
+  dawn_tint_dir = "${dawn_root}/third_party/tint"
 }