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

Split off libdawn_wire_headers from BUILD.gn 

These need to be separated from the main BUILD.gn as well.
They cannot be easily guarded behind build flags in Chromium
because the WebGPUImplementation will extend
dawn_wire::CommandSerializer.

Bug: dawn:61
Change-Id: Ic7d6bb13cc535ecddb99c832407ba1f37019ed93
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/5401
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Austin Eng 2019-03-08 00:51:27 +00:00 committed by Commit Bot service account
parent b6a80b321e
commit 8c1a90199a
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BUILD.gn
View File

@ -405,21 +405,6 @@ dawn_component("libdawn_native") {
# libdawn_wire # libdawn_wire
############################################################################### ###############################################################################
# Public libdawn_wire headers so they can be publically visible for
# dependencies of libdawn_wire
source_set("libdawn_wire_headers") {
public_deps = [
"${dawn_root}/src/dawn:dawn_headers",
]
public_configs = [ "${dawn_root}/src/common:dawn_public" ]
sources = [
"src/include/dawn_wire/Wire.h",
"src/include/dawn_wire/WireClient.h",
"src/include/dawn_wire/WireServer.h",
"src/include/dawn_wire/dawn_wire_export.h",
]
}
dawn_generator("libdawn_wire_gen") { dawn_generator("libdawn_wire_gen") {
target = "dawn_wire" target = "dawn_wire"
outputs = [ outputs = [
@ -446,8 +431,8 @@ dawn_component("libdawn_wire") {
deps = [ deps = [
":libdawn_wire_gen", ":libdawn_wire_gen",
":libdawn_wire_headers",
"${dawn_root}/src/common", "${dawn_root}/src/common",
"${dawn_root}/src/dawn_wire:libdawn_wire_headers",
] ]
configs = [ "${dawn_root}/src/common:dawn_internal" ] configs = [ "${dawn_root}/src/common:dawn_internal" ]
@ -480,7 +465,7 @@ dawn_component("libdawn_wire") {
# Make headers publically visible # Make headers publically visible
public_deps = [ public_deps = [
":libdawn_wire_headers", "${dawn_root}/src/dawn_wire:libdawn_wire_headers",
] ]
} }

37
src/dawn_wire/BUILD.gn Normal file
View File

@ -0,0 +1,37 @@
# Copyright 2019 The Dawn Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import("../../scripts/dawn_overrides_with_defaults.gni")
import("${dawn_root}/scripts/dawn_component.gni")
import("${dawn_root}/generator/dawn_generator.gni")
###############################################################################
# libdawn_wire
###############################################################################
# Public libdawn_wire headers so they can be publically visible for
# dependencies of libdawn_wire
source_set("libdawn_wire_headers") {
public_deps = [
"${dawn_root}/src/dawn:dawn_headers",
]
public_configs = [ "${dawn_root}/src/common:dawn_public" ]
sources = [
"${dawn_root}/src/include/dawn_wire/Wire.h",
"${dawn_root}/src/include/dawn_wire/WireClient.h",
"${dawn_root}/src/include/dawn_wire/WireServer.h",
"${dawn_root}/src/include/dawn_wire/dawn_wire_export.h",
]
}