[fuchsia] rename gn group to fuchsia

now that we import fuchsia-sysinfo and fdio, this isn't really just zx anymore

Change-Id: Ic42359ce3d230e214ebdbbefb880ccb021434a0f
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/1555533
Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: Francois Rousseau <frousseau@google.com>
This commit is contained in:
Francois Rousseau 2019-04-05 15:45:15 -07:00 committed by Commit Bot
parent b0373799ba
commit 0730f0c60c
6 changed files with 20 additions and 11 deletions

View File

@ -88,7 +88,9 @@ static_library("client") {
} }
if (crashpad_is_fuchsia) { if (crashpad_is_fuchsia) {
deps = [ "../third_party/fuchsia:zx" ] deps = [
"../third_party/fuchsia",
]
if (crashpad_is_in_fuchsia) { if (crashpad_is_in_fuchsia) {
deps += [ "//zircon/public/lib/fdio" ] deps += [ "//zircon/public/lib/fdio" ]
} }

View File

@ -84,7 +84,7 @@ static_library("handler") {
} }
if (crashpad_is_fuchsia) { if (crashpad_is_fuchsia) {
deps += [ "../third_party/fuchsia:zx" ] deps += [ "../third_party/fuchsia" ]
} }
} }

View File

@ -134,7 +134,7 @@ static_library("test") {
if (crashpad_is_fuchsia) { if (crashpad_is_fuchsia) {
public_deps = [ public_deps = [
"../third_party/fuchsia:zx", "../third_party/fuchsia",
] ]
if (crashpad_is_in_fuchsia) { if (crashpad_is_in_fuchsia) {
deps += [ "//zircon/public/lib/fdio" ] deps += [ "//zircon/public/lib/fdio" ]

View File

@ -15,7 +15,7 @@
import("../../build/crashpad_buildconfig.gni") import("../../build/crashpad_buildconfig.gni")
if (crashpad_is_in_fuchsia) { if (crashpad_is_in_fuchsia) {
group("zx") { group("fuchsia") {
public_deps = [ public_deps = [
"//zircon/public/fidl/fuchsia-sysinfo:fuchsia-sysinfo_c", "//zircon/public/fidl/fuchsia-sysinfo:fuchsia-sysinfo_c",
"//zircon/public/lib/fdio", "//zircon/public/lib/fdio",
@ -23,7 +23,7 @@ if (crashpad_is_in_fuchsia) {
] ]
} }
} else if (crashpad_is_in_chromium) { } else if (crashpad_is_in_chromium) {
group("zx") { group("fuchsia") {
public_deps = [ public_deps = [
"//third_party/fuchsia-sdk/sdk:fdio", "//third_party/fuchsia-sdk/sdk:fdio",
"//third_party/fuchsia-sdk/sdk:sysinfo", "//third_party/fuchsia-sdk/sdk:sysinfo",
@ -36,12 +36,16 @@ if (crashpad_is_in_fuchsia) {
sdk_fidl_path = "$sdk_path/fidl" sdk_fidl_path = "$sdk_path/fidl"
config("zx_config") { config("zx_config") {
visibility = [ ":zx" ] visibility = [ ":fuchsia" ]
include_dirs = [ "$sdk_pkg_path/zx/include" ]
}
config("fidl_config") {
visibility = [ ":fuchsia" ]
include_dirs = [ include_dirs = [
"$root_gen_dir/fidl/include", "$root_gen_dir/fidl/include",
"$sdk_pkg_path/fidl/include", "$sdk_pkg_path/fidl/include",
"$sdk_pkg_path/fidl_base/include", "$sdk_pkg_path/fidl_base/include",
"$sdk_pkg_path/zx/include",
] ]
} }
@ -94,7 +98,7 @@ if (crashpad_is_in_fuchsia) {
} }
} }
static_library("zx") { static_library("fuchsia") {
sources = sources =
[ [
# This is the zx library. # This is the zx library.
@ -166,6 +170,9 @@ if (crashpad_is_in_fuchsia) {
":fuchsia.sysinfo", ":fuchsia.sysinfo",
] ]
public_configs = [ ":zx_config" ] public_configs = [
":fidl_config",
":zx_config",
]
} }
} }

View File

@ -97,7 +97,7 @@ if (crashpad_is_in_chromium) {
configs += [ ":gtest_private_config" ] configs += [ ":gtest_private_config" ]
if (crashpad_is_fuchsia) { if (crashpad_is_fuchsia) {
deps = [ deps = [
"../fuchsia:zx", "../fuchsia",
] ]
} }
} }

View File

@ -467,7 +467,7 @@ static_library("util") {
} }
if (crashpad_is_fuchsia) { if (crashpad_is_fuchsia) {
public_deps += [ "../third_party/fuchsia:zx" ] public_deps += [ "../third_party/fuchsia" ]
} }
} }