From 0730f0c60c40452f39436db6bf3a5f8e1e885adc Mon Sep 17 00:00:00 2001
From: Francois Rousseau <frousseau@google.com>
Date: Fri, 5 Apr 2019 15:45:15 -0700
Subject: [PATCH] [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>
---
 client/BUILD.gn              |  4 +++-
 handler/BUILD.gn             |  2 +-
 test/BUILD.gn                |  2 +-
 third_party/fuchsia/BUILD.gn | 19 +++++++++++++------
 third_party/gtest/BUILD.gn   |  2 +-
 util/BUILD.gn                |  2 +-
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/client/BUILD.gn b/client/BUILD.gn
index f23185de..56312af0 100644
--- a/client/BUILD.gn
+++ b/client/BUILD.gn
@@ -88,7 +88,9 @@ static_library("client") {
   }
 
   if (crashpad_is_fuchsia) {
-    deps = [ "../third_party/fuchsia:zx" ]
+    deps = [
+      "../third_party/fuchsia",
+    ]
     if (crashpad_is_in_fuchsia) {
       deps += [ "//zircon/public/lib/fdio" ]
     }
diff --git a/handler/BUILD.gn b/handler/BUILD.gn
index bbd68ab1..67c77e5f 100644
--- a/handler/BUILD.gn
+++ b/handler/BUILD.gn
@@ -84,7 +84,7 @@ static_library("handler") {
   }
 
   if (crashpad_is_fuchsia) {
-    deps += [ "../third_party/fuchsia:zx" ]
+    deps += [ "../third_party/fuchsia" ]
   }
 }
 
diff --git a/test/BUILD.gn b/test/BUILD.gn
index bded2c60..fb99bce6 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -134,7 +134,7 @@ static_library("test") {
 
   if (crashpad_is_fuchsia) {
     public_deps = [
-      "../third_party/fuchsia:zx",
+      "../third_party/fuchsia",
     ]
     if (crashpad_is_in_fuchsia) {
       deps += [ "//zircon/public/lib/fdio" ]
diff --git a/third_party/fuchsia/BUILD.gn b/third_party/fuchsia/BUILD.gn
index 6965dfe0..294d08d6 100644
--- a/third_party/fuchsia/BUILD.gn
+++ b/third_party/fuchsia/BUILD.gn
@@ -15,7 +15,7 @@
 import("../../build/crashpad_buildconfig.gni")
 
 if (crashpad_is_in_fuchsia) {
-  group("zx") {
+  group("fuchsia") {
     public_deps = [
       "//zircon/public/fidl/fuchsia-sysinfo:fuchsia-sysinfo_c",
       "//zircon/public/lib/fdio",
@@ -23,7 +23,7 @@ if (crashpad_is_in_fuchsia) {
     ]
   }
 } else if (crashpad_is_in_chromium) {
-  group("zx") {
+  group("fuchsia") {
     public_deps = [
       "//third_party/fuchsia-sdk/sdk:fdio",
       "//third_party/fuchsia-sdk/sdk:sysinfo",
@@ -36,12 +36,16 @@ if (crashpad_is_in_fuchsia) {
   sdk_fidl_path = "$sdk_path/fidl"
 
   config("zx_config") {
-    visibility = [ ":zx" ]
+    visibility = [ ":fuchsia" ]
+    include_dirs = [ "$sdk_pkg_path/zx/include" ]
+  }
+
+  config("fidl_config") {
+    visibility = [ ":fuchsia" ]
     include_dirs = [
       "$root_gen_dir/fidl/include",
       "$sdk_pkg_path/fidl/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 =
         [
           # This is the zx library.
@@ -166,6 +170,9 @@ if (crashpad_is_in_fuchsia) {
       ":fuchsia.sysinfo",
     ]
 
-    public_configs = [ ":zx_config" ]
+    public_configs = [
+      ":fidl_config",
+      ":zx_config",
+    ]
   }
 }
diff --git a/third_party/gtest/BUILD.gn b/third_party/gtest/BUILD.gn
index e124b9e7..c2058e23 100644
--- a/third_party/gtest/BUILD.gn
+++ b/third_party/gtest/BUILD.gn
@@ -97,7 +97,7 @@ if (crashpad_is_in_chromium) {
     configs += [ ":gtest_private_config" ]
     if (crashpad_is_fuchsia) {
       deps = [
-        "../fuchsia:zx",
+        "../fuchsia",
       ]
     }
   }
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 41a74d63..f571b863 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -467,7 +467,7 @@ static_library("util") {
   }
 
   if (crashpad_is_fuchsia) {
-    public_deps += [ "../third_party/fuchsia:zx" ]
+    public_deps += [ "../third_party/fuchsia" ]
   }
 }