[fuchsia] Migrate FIDL deps to use SDK-provided targets.

TBR=palmer,agl,dalecurtis,spang,reed

Bug: 1050703
Change-Id: I3b306c58833d94273929b8e1580c9f176f739051
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2056827Reviewed-by: Wez <wez@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Auto-Submit: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742143}

base/BUILD.gn

@@ -1618,10 +1618,10 @@ jumbo_component("base") {
       "//third_party/fuchsia-sdk/sdk:async",
       "//third_party/fuchsia-sdk/sdk:fdio",
       "//third_party/fuchsia-sdk/sdk:fidl_cpp",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-intl",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-io",
       "//third_party/fuchsia-sdk/sdk:sys_cpp",
       "//third_party/fuchsia-sdk/sdk:zx",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.intl",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.io",
     ]
 
     deps += [
@@ -1629,9 +1629,9 @@ jumbo_component("base") {
       "//third_party/fuchsia-sdk/sdk:async-loop-cpp",
       "//third_party/fuchsia-sdk/sdk:async-loop-default",
       "//third_party/fuchsia-sdk/sdk:fidl",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
       "//third_party/fuchsia-sdk/sdk:syslog",
       "//third_party/fuchsia-sdk/sdk:vfs_cpp",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
       "//third_party/icu",
     ]
   }
@@ -3065,10 +3065,10 @@ test("base_unittests") {
       "//third_party/fuchsia-sdk/sdk:async",
       "//third_party/fuchsia-sdk/sdk:async-default",
       "//third_party/fuchsia-sdk/sdk:fdio",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-intl",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-logger",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
       "//third_party/fuchsia-sdk/sdk:sys_cpp",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.intl",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.logger",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
     ]
 
     manifest = "//build/config/fuchsia/tests.cmx"

chromecast/media/cma/backend/fuchsia/BUILD.gn

@@ -48,8 +48,8 @@ cast_source_set("mixer_output") {
     "//chromecast/base",
     "//chromecast/public/media",
     "//media",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-media",
     "//third_party/fuchsia-sdk/sdk:sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media",
   ]
 }
 
@@ -64,6 +64,6 @@ cast_source_set("unit_tests") {
     "//base",
     "//base/test:test_support",
     "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-media",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media",
   ]
 }

chromecast/net/BUILD.gn

@@ -34,7 +34,7 @@ cast_source_set("net") {
 
     deps += [
       "//chromecast/base:chromecast_switches",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-hardware-ethernet",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.hardware.ethernet",
     ]
   }
 }

chromecast/system/reboot/BUILD.gn

@@ -59,7 +59,7 @@ if (is_fuchsia) {
       "//base",
       "//third_party/fuchsia-sdk/sdk:fidl",
       "//third_party/fuchsia-sdk/sdk:fidl_cpp",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-hardware-power-statecontrol",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.hardware.power.statecontrol",
     ]
   }
 }

content/shell/BUILD.gn

@@ -361,7 +361,7 @@ jumbo_static_library("content_shell_lib") {
       "//components/crash/content/app:test_support",
       "//components/crash/content/browser",
     ]
-    deps += [ "//third_party/fuchsia-sdk/sdk:fuchsia-ui-policy" ]
+    deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy" ]
   }
 
   # Annoyingly, this target and web_test_support have circular includes.

fuchsia/base/BUILD.gn

@@ -25,7 +25,7 @@ source_set("base") {
   ]
   deps = [
     "//base",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-mem",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.mem",
   ]
 }
 
@@ -41,8 +41,8 @@ source_set("modular") {
   ]
   deps = [ "//base" ]
   public_deps = [
-    "//third_party/fuchsia-sdk/sdk:fuchsia-modular",
     "//third_party/fuchsia-sdk/sdk:sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular",
   ]
 }
 
@@ -56,7 +56,7 @@ source_set("message_port") {
     "//mojo/public/cpp/bindings",
     "//third_party/blink/public/common",
     "//third_party/blink/public/common:headers",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
   ]
 }
 
@@ -92,8 +92,8 @@ source_set("test_support") {
     "//base",
     "//net",
     "//net:test_support",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-modular",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
     "//url",
   ]
 }

fuchsia/engine/BUILD.gn

@@ -93,11 +93,11 @@ component("web_engine_core") {
     "//services/service_manager/sandbox",
     "//skia/public/mojom",
     "//third_party/blink/public/common",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-accessibility-semantics",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-math",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-ui-gfx",
     "//third_party/fuchsia-sdk/sdk:scenic_cpp",
     "//third_party/fuchsia-sdk/sdk:sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.math",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.gfx",
     "//third_party/widevine/cdm:headers",
     "//ui/accessibility",
     "//ui/aura",
@@ -113,7 +113,7 @@ component("web_engine_core") {
   data_deps = [ ":web_engine_pak" ]
   public_deps = [
     "//content/public/browser",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
   ]
   data = [ "$root_out_dir/web_engine.pak" ]
   configs += [ ":web_engine_implementation" ]
@@ -238,7 +238,7 @@ source_set("browsertest_core") {
     "//content/test:test_support",
     "//net:test_support",
     "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
     "//ui/ozone",
   ]
 }
@@ -265,8 +265,8 @@ test("web_engine_browsertests") {
     "//net:test_support",
     "//testing/gmock",
     "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-accessibility-semantics",
     "//third_party/fuchsia-sdk/sdk:scenic_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics",
     "//ui/gfx",
     "//ui/ozone",
   ]
@@ -294,9 +294,9 @@ test("web_engine_unittests") {
     "//services/network/public/mojom",
     "//testing/gmock",
     "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-accessibility-semantics",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
     "//third_party/fuchsia-sdk/sdk:scenic_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
   ]
 }
 
@@ -314,8 +314,8 @@ test("web_engine_integration_tests") {
     "//base/test:run_all_unittests",
     "//fuchsia/base",
     "//fuchsia/base:test_support",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
   ]
   package_deps = [ [
         ":web_engine",
@@ -348,10 +348,10 @@ executable("web_engine_shell_exec") {
   deps = [
     "//base",
     "//fuchsia/base",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-ui-policy",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
     "//third_party/fuchsia-sdk/sdk:scenic_cpp",
     "//third_party/fuchsia-sdk/sdk:sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
     "//url",
   ]
 }

fuchsia/http/BUILD.gn

@@ -21,9 +21,9 @@ source_set("core") {
     "//base:base",
     "//fuchsia/base",
     "//net:net",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-net-oldhttp",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
     "//third_party/fuchsia-sdk/sdk:sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.net.oldhttp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
   ]
   visibility = [ ":*" ]
 }

fuchsia/runners/BUILD.gn

@@ -42,11 +42,11 @@ source_set("common") {
     "//url",
   ]
   public_deps = [
-    "//third_party/fuchsia-sdk/sdk:fuchsia-modular",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-ui-app",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
     "//third_party/fuchsia-sdk/sdk:sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.app",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
   ]
   visibility = [ ":*" ]
 }
@@ -69,14 +69,14 @@ source_set("cast_runner_core") {
     "//base",
     "//fuchsia/base",
     "//fuchsia/base:modular",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-modular",
     "//third_party/fuchsia-sdk/sdk:sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular",
     "//url",
   ]
   public_deps = [
     ":common",
     "//fuchsia:cast_fidl",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
   ]
   visibility = [ ":*" ]
 }
@@ -123,7 +123,7 @@ source_set("cast_runner_test_core") {
   public_deps = [
     "//base",
     "//fuchsia:cast_fidl",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
     "//url",
   ]
   visibility = [ ":*" ]
@@ -141,7 +141,7 @@ test("cast_runner_unittests") {
     "//net:test_support",
     "//testing/gmock",
     "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
   ]
 }
 
@@ -156,9 +156,9 @@ test("cast_runner_integration_tests") {
     "//fuchsia/base:test_support",
     "//net:test_support",
     "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-modular",
     "//third_party/fuchsia-sdk/sdk:scenic_cpp",
     "//third_party/fuchsia-sdk/sdk:sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular",
   ]
   package_deps = [ [
         "//fuchsia/engine:web_engine",
@@ -225,7 +225,7 @@ test("web_runner_integration_tests") {
     "//fuchsia/base:modular",
     "//net:test_support",
     "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
   ]
   package_deps = [
     [

media/audio/BUILD.gn

@@ -296,8 +296,8 @@ source_set("audio") {
       "fuchsia/audio_output_stream_fuchsia.h",
     ]
     deps += [
-      "//third_party/fuchsia-sdk/sdk:fuchsia-media",
       "//third_party/fuchsia-sdk/sdk:sys_cpp",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media",
     ]
   }
 

media/filters/BUILD.gn

@@ -223,10 +223,10 @@ jumbo_source_set("filters") {
       "//gpu/ipc/common",
       "//media/fuchsia/cdm",
       "//media/fuchsia/common",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-media",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-mediacodec",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-sysmem",
       "//third_party/fuchsia-sdk/sdk:sys_cpp",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.mediacodec",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sysmem",
       "//ui/ozone",
     ]
   }
@@ -331,8 +331,8 @@ source_set("unit_tests") {
     deps += [
       "//components/viz/test:test_support",
       "//gpu/command_buffer/client",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-sysmem",
       "//third_party/fuchsia-sdk/sdk:sys_cpp",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sysmem",
     ]
   }
 

media/fuchsia/audio/BUILD.gn

@@ -7,9 +7,9 @@ source_set("audio") {
     "//base",
     "//media",
     "//media/fuchsia/mojom",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-media",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-media-audio",
     "//third_party/fuchsia-sdk/sdk:sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media.audio",
   ]
 
   sources = [

media/fuchsia/cdm/BUILD.gn

@@ -18,7 +18,7 @@ source_set("cdm") {
     "fuchsia_stream_decryptor.h",
   ]
 
-  public_deps = [ "//third_party/fuchsia-sdk/sdk:fuchsia-media-drm" ]
+  public_deps = [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media.drm" ]
 
   configs += [ "//media:subcomponent_config" ]
 

media/fuchsia/cdm/service/BUILD.gn

@@ -10,7 +10,7 @@ source_set("service") {
     "fuchsia_cdm_manager.h",
   ]
 
-  public_deps = [ "//third_party/fuchsia-sdk/sdk:fuchsia-media-drm" ]
+  public_deps = [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media.drm" ]
 
   deps = [
     "//fuchsia/base",

media/fuchsia/common/BUILD.gn

@@ -21,7 +21,7 @@ source_set("common") {
   deps = [
     "//base",
     "//media/base",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-media",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-sysmem",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sysmem",
   ]
 }

media/fuchsia/mojom/fuchsia_audio_consumer_provider.typemap

@@ -7,11 +7,10 @@ os_whitelist = [ "fuchsia" ]
 public_headers = [ "fuchsia/media/drm/cpp/fidl.h" ]
 traits_headers =
     [ "//media/fuchsia/mojom/fuchsia_audio_consumer_provider_mojom_traits.h" ]
-sources = [
-  "//media/fuchsia/mojom/fuchsia_audio_consumer_provider_mojom_traits.h",
-]
+sources =
+    [ "//media/fuchsia/mojom/fuchsia_audio_consumer_provider_mojom_traits.h" ]
 public_deps = [
   "//fuchsia/mojom:traits",
-  "//third_party/fuchsia-sdk/sdk:fuchsia-media",
+  "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media",
 ]
 type_mappings = [ "media.mojom.AudioConsumerRequest=::fidl::InterfaceRequest<::fuchsia::media::AudioConsumer>[move_only]" ]

media/fuchsia/mojom/fuchsia_cdm_provider.typemap

@@ -6,11 +6,9 @@ mojom = "//media/fuchsia/mojom/fuchsia_cdm_provider.mojom"
 os_whitelist = [ "fuchsia" ]
 public_headers = [ "fuchsia/media/drm/cpp/fidl.h" ]
 traits_headers = [ "//media/fuchsia/mojom/fuchsia_cdm_provider_mojom_traits.h" ]
-sources = [
-  "//media/fuchsia/mojom/fuchsia_cdm_provider_mojom_traits.h",
-]
+sources = [ "//media/fuchsia/mojom/fuchsia_cdm_provider_mojom_traits.h" ]
 public_deps = [
   "//fuchsia/mojom:traits",
-  "//third_party/fuchsia-sdk/sdk:fuchsia-media-drm",
+  "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media.drm",
 ]
 type_mappings = [ "media.mojom.CdmRequest=::fidl::InterfaceRequest<::fuchsia::media::drm::ContentDecryptionModule>[move_only]" ]

net/BUILD.gn

@@ -1698,9 +1698,9 @@ source_set("net_deps") {
 
     if (is_fuchsia) {
       public_deps += [
-        "//third_party/fuchsia-sdk/sdk:fuchsia-hardware-ethernet",
-        "//third_party/fuchsia-sdk/sdk:fuchsia-netstack",
         "//third_party/fuchsia-sdk/sdk:sys_cpp",
+        "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.hardware.ethernet",
+        "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.netstack",
       ]
     }
 
@@ -4616,7 +4616,7 @@ test("net_unittests") {
     use_test_server = true
     deps += [
       "//third_party/fuchsia-sdk/sdk:fidl_cpp",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-netstack",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.netstack",
     ]
     sources += [ "base/network_change_notifier_fuchsia_unittest.cc" ]
   }

services/service_manager/sandbox/BUILD.gn

@@ -110,14 +110,14 @@ component("sandbox") {
     ]
 
     deps += [
-      "//third_party/fuchsia-sdk/sdk:fuchsia-fonts",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-intl",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-logger",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-mediacodec",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-net",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-netstack",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-sysmem",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-ui-scenic",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.fonts",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.intl",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.logger",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.mediacodec",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.net",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.netstack",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sysmem",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.scenic",
     ]
   }
 }

skia/BUILD.gn

@@ -473,11 +473,11 @@ component("skia") {
       "ext/fontmgr_default_fuchsia.cc",
     ]
     deps += [
-      "//third_party/fuchsia-sdk/sdk:fuchsia-fonts",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-io",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
       "//third_party/fuchsia-sdk/sdk:sys_cpp",
       "//third_party/fuchsia-sdk/sdk:zx",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.fonts",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.io",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
       "//third_party/icu:icuuc",
     ]
   }
@@ -884,10 +884,10 @@ source_set("test_fonts") {
       "ext/test_fonts_fuchsia.h",
     ]
     deps += [
-      "//third_party/fuchsia-sdk/sdk:fuchsia-fonts",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-io",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
       "//third_party/fuchsia-sdk/sdk:sys_cpp",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.fonts",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.io",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
     ]
   }
   if (is_linux) {
@@ -937,7 +937,7 @@ test("skia_unittests") {
   if (is_fuchsia) {
     sources += [ "ext/fontmgr_fuchsia_unittest.cc" ]
     deps += [
-      "//third_party/fuchsia-sdk/sdk:fuchsia-fonts",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.fonts",
       "//third_party/test_fonts",
     ]
     data_deps = [ "//third_party/test_fonts" ]

ui/base/ime/fuchsia/BUILD.gn

@@ -19,8 +19,8 @@ jumbo_component("fuchsia") {
   defines = [ "IS_UI_BASE_IME_FUCHSIA_IMPL" ]
 
   public_deps = [
-    "//third_party/fuchsia-sdk/sdk:fuchsia-ui-input",
     "//third_party/fuchsia-sdk/sdk:sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.input",
     "//ui/base/ime",
     "//ui/events",
   ]

ui/events/BUILD.gn

@@ -366,7 +366,7 @@ jumbo_component("events") {
       "fuchsia/input_event_dispatcher_delegate.h",
     ]
     sources += [ "fuchsia/input_event_dispatcher.cc" ]
-    public_deps += [ "//third_party/fuchsia-sdk/sdk:fuchsia-ui-input" ]
+    public_deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.input" ]
   }
 }
 
@@ -647,7 +647,7 @@ if (!is_ios) {
 
     if (is_fuchsia) {
       sources += [ "fuchsia/input_event_dispatcher_unittest.cc" ]
-      deps += [ "//third_party/fuchsia-sdk/sdk:fuchsia-ui-input" ]
+      deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.input" ]
     }
 
     if (is_win || is_mac || use_ozone) {

ui/ozone/demo/BUILD.gn

@@ -39,7 +39,7 @@ source_set("ozone_demo_lib") {
   ]
 
   if (is_fuchsia) {
-    deps += [ "//third_party/fuchsia-sdk/sdk:fuchsia-ui-policy" ]
+    deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy" ]
   }
 }
 

ui/ozone/platform/scenic/BUILD.gn

@@ -46,13 +46,13 @@ source_set("scenic") {
     "//mojo/public/cpp/system",
     "//services/service_manager/public/cpp",
     "//skia",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-images",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-mem",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-sysmem",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-ui-gfx",
-    "//third_party/fuchsia-sdk/sdk:fuchsia-ui-scenic",
     "//third_party/fuchsia-sdk/sdk:scenic_cpp",
     "//third_party/fuchsia-sdk/sdk:sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.images",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.mem",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sysmem",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.gfx",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.scenic",
     "//ui/base",
     "//ui/base/ime/fuchsia",
     "//ui/display/fake",

ui/platform_window/BUILD.gn

@@ -29,10 +29,10 @@ component("platform_window") {
     ]
 
     public_deps = [
-      "//third_party/fuchsia-sdk/sdk:fuchsia-ui-policy",
-      "//third_party/fuchsia-sdk/sdk:fuchsia-ui-views",
       "//third_party/fuchsia-sdk/sdk:scenic_cpp",
       "//third_party/fuchsia-sdk/sdk:sys_cpp",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.views",
     ]
   }
 }