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

Remove temporary GN groups after Chromium fix 

Bug: chromium:1064305
Change-Id: I8e169de411500c4b618c0a91bb0d8fd0ffb490d5
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/19180
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2020-04-09 17:27:40 +00:00 committed by Commit Bot service account
parent 757d153d54
commit 0074b6e710
4 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BUILD.gn
View File

@ -638,24 +638,6 @@ group("dawn_fuzzers") {
# Temporary groups # Temporary groups
############################################################################### ###############################################################################
group("libdawn_native") {
public_deps = [
"src/dawn_native",
]
}
group("libdawn_native_sources") {
public_deps = [
"src/dawn_native:dawn_native_sources",
]
}
group("libdawn_wire") {
public_deps = [
"src/dawn_wire",
]
}
# Temporary groups to make a 5-way patch to fix crbug.com/913171 # Temporary groups to make a 5-way patch to fix crbug.com/913171
group("dawn_unittests_temp_group") { group("dawn_unittests_temp_group") {
testonly = true testonly = true

8
src/dawn/BUILD.gn
View File

@ -17,14 +17,6 @@ import("../../scripts/dawn_overrides_with_defaults.gni")
import("${dawn_root}/generator/dawn_generator.gni") import("${dawn_root}/generator/dawn_generator.gni")
import("${dawn_root}/scripts/dawn_component.gni") import("${dawn_root}/scripts/dawn_component.gni")
# Temporary group to not break Chromium `gn check` on Dawn CQ.
group("libdawn") {
deps = [
":dawncpp",
":libdawn_proc",
]
}
############################################################################### ###############################################################################
# Dawn headers # Dawn headers
############################################################################### ###############################################################################

22
src/dawn_native/BUILD.gn
View File

@ -102,7 +102,9 @@ if (dawn_enable_opengl) {
# Public dawn_native headers so they can be publicly visible for # Public dawn_native headers so they can be publicly visible for
# dependencies of dawn_native # dependencies of dawn_native
source_set("dawn_native_headers") { source_set("dawn_native_headers") {
public_deps = [ "${dawn_root}/src/dawn:dawncpp_headers" ] public_deps = [
"${dawn_root}/src/dawn:dawncpp_headers",
]
all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ] all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
sources = [ sources = [
"${dawn_root}/src/include/dawn_native/DawnNative.h", "${dawn_root}/src/include/dawn_native/DawnNative.h",
@ -569,13 +571,17 @@ dawn_component("dawn_native") {
DEFINE_PREFIX = "DAWN_NATIVE" DEFINE_PREFIX = "DAWN_NATIVE"
#Make headers publically visible #Make headers publically visible
public_deps = [ ":dawn_native_headers" ] public_deps = [
":dawn_native_headers",
]
deps = [ deps = [
":dawn_native_sources", ":dawn_native_sources",
"${dawn_root}/src/common", "${dawn_root}/src/common",
] ]
sources = [ "DawnNative.cpp" ] sources = [
"DawnNative.cpp",
]
configs = [ ":dawn_native_internal" ] configs = [ ":dawn_native_internal" ]
public_configs = [ ":dawn_native_weak_framework" ] public_configs = [ ":dawn_native_weak_framework" ]
@ -595,8 +601,9 @@ dawn_component("dawn_native") {
sources += [ "vulkan/VulkanBackend.cpp" ] sources += [ "vulkan/VulkanBackend.cpp" ]
if (enable_vulkan_validation_layers) { if (enable_vulkan_validation_layers) {
data_deps = data_deps = [
[ "${dawn_vulkan_validation_layers_dir}:vulkan_validation_layers" ] "${dawn_vulkan_validation_layers_dir}:vulkan_validation_layers",
]
if (!is_android) { if (!is_android) {
data_deps += data_deps +=
[ "${dawn_vulkan_validation_layers_dir}:vulkan_gen_json_files" ] [ "${dawn_vulkan_validation_layers_dir}:vulkan_gen_json_files" ]
@ -604,8 +611,3 @@ dawn_component("dawn_native") {
} }
} }
} }
# Temporary group for a 3-way patch with Chromium
group("libdawn_native_headers") {
public_deps = [ ":dawn_native_headers" ]
}

7
src/dawn_wire/BUILD.gn
View File

@ -93,10 +93,3 @@ dawn_component("dawn_wire") {
":dawn_wire_headers", ":dawn_wire_headers",
] ]
} }
# Temporary group for a 3-way patch with Chromium
group("libdawn_wire_headers") {
public_deps = [
":dawn_wire_headers",
]
}