Skip to content

Commit c3915f7

Browse files
bsalomonSkCQ
authored andcommitted
Reland "Enable non-standalone builds with dawn"
This reverts commit 122f1b9. Reason for revert: unrelated to G3 failure? Original change's description: > Revert "Enable non-standalone builds with dawn" > > This reverts commit 25deba3. > > Reason for revert: Possible Google3 roll break > > Original change's description: > > Enable non-standalone builds with dawn > > > > Bug: skia:12276 > > Change-Id: Iaf7311fef43bd9c37bfc7b7a6221f6bea25f196d > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/433696 > > Auto-Submit: Safa Sofuoglu <safasofuoglu@gmail.com> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > Reviewed-by: Stephen White <senorblanco@google.com> > > Commit-Queue: Brian Salomon <bsalomon@google.com> > > TBR=bsalomon@google.com,senorblanco@google.com,skcq-be@skia-corp.google.com.iam.gserviceaccount.com,safasofuoglu@gmail.com > > Change-Id: I05dc7e1107ae08d4c9d4a7663704eb14f711208d > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:12276 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/471757 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Julia Lavrova <jlavrova@google.com> # Not skipping CQ checks because this is a reland. Bug: skia:12276 Change-Id: Ifca6eaba59083afef4bb7a1ee73de1b8538b383b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/471761 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
1 parent 686ccec commit c3915f7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Opera Software ASA <*@opera.com>
4646
Pavel Krajcevski <pavel@cs.unc.edu>
4747
Petar Kirov <petar.p.kirov@gmail.com>
4848
Raul Tambre <raul@tambre.ee>
49+
Safa Sofuoglu <safasofuoglu@gmail.com>
4950
Samsung <*@samsung.com>
5051
Samsung Open Source Group <*@osg.samsung.com>
5152
Sergey Melnikov <Melnikov.Sergey.V@gmail.com>

BUILD.gn

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if (is_fuchsia) {
1414
}
1515

1616
if (skia_use_dawn) {
17-
import("third_party/externals/dawn/scripts/dawn_features.gni")
17+
import("//third_party/externals/dawn/scripts/dawn_features.gni")
1818
}
1919

2020
if (defined(skia_settings)) {
@@ -928,8 +928,11 @@ optional("gpu") {
928928
deps += [
929929
"//third_party/externals/dawn/src/dawn:dawn_proc",
930930
"//third_party/externals/dawn/src/dawn:dawncpp",
931-
"//third_party/externals/dawn/src/dawn_native",
932931
]
932+
if (dawn_enable_d3d12 || dawn_enable_desktop_gl || dawn_enable_metal ||
933+
dawn_enable_opengles || dawn_enable_vulkan) {
934+
deps += [ "//third_party/externals/dawn/src/dawn_native" ]
935+
}
933936
if (dawn_enable_d3d12) {
934937
libs += [
935938
"d3d12.lib",

0 commit comments

Comments
 (0)