summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chromium/third_party/dawn/src/dawn/common/BUILD.gn45
1 files changed, 19 insertions, 26 deletions
diff --git a/chromium/third_party/dawn/src/dawn/common/BUILD.gn b/chromium/third_party/dawn/src/dawn/common/BUILD.gn
index 183ddf5ba4d..ef8400cbff4 100644
--- a/chromium/third_party/dawn/src/dawn/common/BUILD.gn
+++ b/chromium/third_party/dawn/src/dawn/common/BUILD.gn
@@ -14,7 +14,6 @@
import("../../../scripts/dawn_overrides_with_defaults.gni")
-import("//build/config/features.gni")
import("//build_overrides/build.gni")
import("${dawn_root}/generator/dawn_generator.gni")
import("${dawn_root}/scripts/dawn_features.gni")
@@ -180,25 +179,23 @@ config("internal_config") {
# Common dawn library
###############################################################################
-if (!use_qt) {
- dawn_generator("dawn_version_gen") {
- script = "${dawn_root}/generator/dawn_version_generator.py"
- args = [
- "--dawn-dir",
- rebase_path("${dawn_root}", root_build_dir),
- ]
-
- # We can use the explicit version file if it is generated instead of relying
- # on the existence of git.
- if (dawn_version_file != "") {
- args += [
- "--version-file",
- rebase_path(dawn_version_file, root_build_dir),
- ]
- }
+dawn_generator("dawn_version_gen") {
+ script = "${dawn_root}/generator/dawn_version_generator.py"
+ args = [
+ "--dawn-dir",
+ rebase_path("${dawn_root}", root_build_dir),
+ ]
- outputs = [ "src/dawn/common/Version_autogen.h" ]
+ # We can use the explicit version file if it is generated instead of relying
+ # on the existence of git.
+ if (dawn_version_file != "") {
+ args += [
+ "--version-file",
+ rebase_path(dawn_version_file, root_build_dir),
+ ]
}
+
+ outputs = [ "src/dawn/common/Version_autogen.h" ]
}
dawn_generator("dawn_gpu_info_gen") {
@@ -271,14 +268,10 @@ if (is_win || is_linux || is_chromeos || is_mac || is_fuchsia || is_android) {
]
sources += get_target_outputs(":dawn_gpu_info_gen")
- if (!use_qt) {
- public_deps = [
- ":dawn_gpu_info_gen",
- ":dawn_version_gen",
- ]
- } else {
- public_deps = [ ":dawn_gpu_info_gen" ]
- }
+ public_deps = [
+ ":dawn_gpu_info_gen",
+ ":dawn_version_gen",
+ ]
if (is_mac) {
sources += [ "SystemUtils_mac.mm" ]