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:
parent
757d153d54
commit
0074b6e710
18
BUILD.gn
18
BUILD.gn
|
@ -638,24 +638,6 @@ group("dawn_fuzzers") {
|
|||
# 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
|
||||
group("dawn_unittests_temp_group") {
|
||||
testonly = true
|
||||
|
|
|
@ -17,14 +17,6 @@ import("../../scripts/dawn_overrides_with_defaults.gni")
|
|||
import("${dawn_root}/generator/dawn_generator.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
|
||||
###############################################################################
|
||||
|
|
|
@ -102,7 +102,9 @@ if (dawn_enable_opengl) {
|
|||
# Public dawn_native headers so they can be publicly visible for
|
||||
# dependencies of dawn_native
|
||||
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" ]
|
||||
sources = [
|
||||
"${dawn_root}/src/include/dawn_native/DawnNative.h",
|
||||
|
@ -569,13 +571,17 @@ dawn_component("dawn_native") {
|
|||
DEFINE_PREFIX = "DAWN_NATIVE"
|
||||
|
||||
#Make headers publically visible
|
||||
public_deps = [ ":dawn_native_headers" ]
|
||||
public_deps = [
|
||||
":dawn_native_headers",
|
||||
]
|
||||
|
||||
deps = [
|
||||
":dawn_native_sources",
|
||||
"${dawn_root}/src/common",
|
||||
]
|
||||
sources = [ "DawnNative.cpp" ]
|
||||
sources = [
|
||||
"DawnNative.cpp",
|
||||
]
|
||||
configs = [ ":dawn_native_internal" ]
|
||||
public_configs = [ ":dawn_native_weak_framework" ]
|
||||
|
||||
|
@ -595,8 +601,9 @@ dawn_component("dawn_native") {
|
|||
sources += [ "vulkan/VulkanBackend.cpp" ]
|
||||
|
||||
if (enable_vulkan_validation_layers) {
|
||||
data_deps =
|
||||
[ "${dawn_vulkan_validation_layers_dir}:vulkan_validation_layers" ]
|
||||
data_deps = [
|
||||
"${dawn_vulkan_validation_layers_dir}:vulkan_validation_layers",
|
||||
]
|
||||
if (!is_android) {
|
||||
data_deps +=
|
||||
[ "${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" ]
|
||||
}
|
||||
|
|
|
@ -93,10 +93,3 @@ dawn_component("dawn_wire") {
|
|||
":dawn_wire_headers",
|
||||
]
|
||||
}
|
||||
|
||||
# Temporary group for a 3-way patch with Chromium
|
||||
group("libdawn_wire_headers") {
|
||||
public_deps = [
|
||||
":dawn_wire_headers",
|
||||
]
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue