[fuchsia] Migrate to fully-qualified FIDL library target names.

Migrate all FIDL library target dependencies from their short names to fully-qualified ones, e.g fuchsia.mem was: //third_party/fuchsia-sdk/sdk:mem and is now //third_party/fuchsia-sdk/sdk:fuchsia-mem TBR=sky,dcheng,dalecurtis,agl,sergeyu,tsepez,yucliu Bug: fuchsia:42135 Change-Id: I3e4632fef22887f9f68ddd2b9d3e34dbb9bc7eed Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1937578Reviewed-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@{#719425}

[fuchsia] Migrate to fully-qualified FIDL library target names.
Migrate all FIDL library target dependencies from their short names to fully-qualified ones, e.g fuchsia.mem was: //third_party/fuchsia-sdk/sdk:mem and is now //third_party/fuchsia-sdk/sdk:fuchsia-mem TBR=sky,dcheng,dalecurtis,agl,sergeyu,tsepez,yucliu Bug: fuchsia:42135 Change-Id: I3e4632fef22887f9f68ddd2b9d3e34dbb9bc7eed Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1937578Reviewed-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@{#719425}
500ab60f · Wez · Commit Bot · f4edd445 · 500ab60f · 500ab60f
Commit 500ab60f authored Nov 27, 2019 by Wez Committed by Commit Bot Nov 27, 2019
22 changed files
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1602,7 +1602,7 @@ 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:io",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-io",
      "//third_party/fuchsia-sdk/sdk:sys_cpp",
      "//third_party/fuchsia-sdk/sdk:zx",
    ]
@@ -1611,9 +1611,9 @@ jumbo_component("base") {
      "//third_party/fuchsia-sdk/sdk:async_default",
      "//third_party/fuchsia-sdk/sdk:async_loop_cpp",
      "//third_party/fuchsia-sdk/sdk:async_loop_default",
-      "//third_party/fuchsia-sdk/sdk:deprecatedtimezone",
      "//third_party/fuchsia-sdk/sdk:fidl",
-      "//third_party/fuchsia-sdk/sdk:sys",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-deprecatedtimezone",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
      "//third_party/fuchsia-sdk/sdk:syslog",
      "//third_party/fuchsia-sdk/sdk:vfs_cpp",
    ]
@@ -3054,8 +3054,8 @@ 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:logger",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-logger",
-      "//third_party/fuchsia-sdk/sdk:sys",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
      "//third_party/fuchsia-sdk/sdk:sys_cpp",
    ]

--- a/chromecast/media/cma/backend/fuchsia/BUILD.gn
+++ b/chromecast/media/cma/backend/fuchsia/BUILD.gn
@@ -50,7 +50,7 @@ cast_source_set("mixer_output") {
    "//chromecast/base",
    "//chromecast/public/media",
    "//media",
-    "//third_party/fuchsia-sdk/sdk:media",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-media",
    "//third_party/fuchsia-sdk/sdk:sys_cpp",
  ]
 }
@@ -68,6 +68,6 @@ cast_source_set("unit_tests") {
    "//base",
    "//base/test:test_support",
    "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:media",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-media",
  ]
 }
--- a/chromecast/net/BUILD.gn
+++ b/chromecast/net/BUILD.gn
@@ -46,7 +46,7 @@ cast_source_set("net") {
    deps += [
      "//chromecast/base:chromecast_switches",
-      "//third_party/fuchsia-sdk/sdk:hardware_ethernet",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-hardware-ethernet",
    ]
  }
 }

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

--- a/fuchsia/base/BUILD.gn
+++ b/fuchsia/base/BUILD.gn
@@ -22,7 +22,7 @@ source_set("base") {
  ]
  deps = [
    "//base",
-    "//third_party/fuchsia-sdk/sdk:mem",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-mem",
  ]
 }
@@ -40,7 +40,7 @@ source_set("modular") {
    "//base",
  ]
  public_deps = [
-    "//third_party/fuchsia-sdk/sdk:modular",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-modular",
    "//third_party/fuchsia-sdk/sdk:sys_cpp",
  ]
 }
@@ -58,7 +58,7 @@ source_set("message_port") {
    "//base",
    "//mojo/public/cpp/bindings",
    "//third_party/blink/public/common",
-    "//third_party/fuchsia-sdk/sdk:web",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
  ]
 }
@@ -84,8 +84,8 @@ source_set("test_support") {
    "//base",
    "//net",
    "//net:test_support",
-    "//third_party/fuchsia-sdk/sdk:modular",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-modular",
-    "//third_party/fuchsia-sdk/sdk:web",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
    "//url",
  ]
 }

--- a/fuchsia/engine/BUILD.gn
+++ b/fuchsia/engine/BUILD.gn
@@ -90,12 +90,12 @@ component("web_engine_core") {
    "//services/service_manager/sandbox",
    "//skia/public/mojom",
    "//third_party/blink/public/common",
-    "//third_party/fuchsia-sdk/sdk:accessibility_semantics",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-accessibility-semantics",
-    "//third_party/fuchsia-sdk/sdk:math",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-math",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-ui-gfx",
+    "//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:ui_gfx",
-    "//third_party/fuchsia-sdk/sdk:web",
    "//third_party/widevine/cdm:headers",
    "//ui/accessibility",
    "//ui/aura",
@@ -241,7 +241,7 @@ source_set("browsertest_core") {
    "//content/test:test_support",
    "//net:test_support",
    "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:web",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
    "//ui/ozone",
  ]
 }
@@ -266,7 +266,7 @@ test("web_engine_browsertests") {
    "//net:test_support",
    "//testing/gmock",
    "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:accessibility_semantics",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-accessibility-semantics",
    "//third_party/fuchsia-sdk/sdk:scenic_cpp",
    "//ui/ozone",
  ]
@@ -294,9 +294,9 @@ test("web_engine_unittests") {
    "//services/network/public/mojom",
    "//testing/gmock",
    "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:accessibility_semantics",
+    "//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:web",
  ]
 }
@@ -316,7 +316,7 @@ test("web_engine_integration_tests") {
    "//base/test:run_all_unittests",
    "//fuchsia/base",
    "//fuchsia/base:test_support",
-    "//third_party/fuchsia-sdk/sdk:web",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
  ]
  package_deps = [ [
        ":web_engine",
@@ -353,10 +353,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:ui_policy",
-    "//third_party/fuchsia-sdk/sdk:web",
    "//url",
  ]
 }

--- a/fuchsia/http/BUILD.gn
+++ b/fuchsia/http/BUILD.gn
@@ -22,8 +22,8 @@ source_set("core") {
    "//base:base",
    "//fuchsia/base",
    "//net:net",
-    "//third_party/fuchsia-sdk/sdk:net_oldhttp",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-net-oldhttp",
-    "//third_party/fuchsia-sdk/sdk:sys",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
    "//third_party/fuchsia-sdk/sdk:sys_cpp",
  ]
  visibility = [ ":*" ]

--- a/fuchsia/runners/BUILD.gn
+++ b/fuchsia/runners/BUILD.gn
@@ -41,13 +41,13 @@ source_set("common") {
    "//base",
    "//fuchsia/base",
    "//fuchsia/base:modular",
-    "//third_party/fuchsia-sdk/sdk:ui_app",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-ui-app",
    "//url",
  ]
  public_deps = [
-    "//third_party/fuchsia-sdk/sdk:sys",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
    "//third_party/fuchsia-sdk/sdk:sys_cpp",
-    "//third_party/fuchsia-sdk/sdk:web",
  ]
  visibility = [ ":*" ]
 }
@@ -72,14 +72,14 @@ source_set("cast_runner_core") {
    "//base",
    "//fuchsia/base",
    "//fuchsia/base:modular",
-    "//third_party/fuchsia-sdk/sdk:modular",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-modular",
    "//third_party/fuchsia-sdk/sdk:sys_cpp",
    "//url",
  ]
  public_deps = [
    ":common",
    "//fuchsia:cast_fidl",
-    "//third_party/fuchsia-sdk/sdk:web",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
  ]
  visibility = [ ":*" ]
 }
@@ -128,7 +128,7 @@ source_set("cast_runner_test_core") {
  public_deps = [
    "//base",
    "//fuchsia:cast_fidl",
-    "//third_party/fuchsia-sdk/sdk:sys",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
    "//url",
  ]
  visibility = [ ":*" ]
@@ -148,7 +148,7 @@ test("cast_runner_unittests") {
    "//net:test_support",
    "//testing/gmock",
    "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:web",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-web",
  ]
 }
@@ -167,7 +167,7 @@ test("cast_runner_integration_tests") {
    "//fuchsia/base:test_support",
    "//net:test_support",
    "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:modular",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-modular",
    "//third_party/fuchsia-sdk/sdk:sys_cpp",
  ]
  package_deps = [ [
@@ -239,7 +239,7 @@ test("web_runner_integration_tests") {
    "//fuchsia/base:modular",
    "//net:test_support",
    "//testing/gtest",
-    "//third_party/fuchsia-sdk/sdk:sys",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
  ]
  package_deps = [
    [

--- a/media/audio/BUILD.gn
+++ b/media/audio/BUILD.gn
@@ -300,7 +300,7 @@ source_set("audio") {
      "fuchsia/audio_output_stream_fuchsia.h",
    ]
    deps += [
-      "//third_party/fuchsia-sdk/sdk:media",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-media",
      "//third_party/fuchsia-sdk/sdk:sys_cpp",
    ]
  }

--- a/media/filters/BUILD.gn
+++ b/media/filters/BUILD.gn
@@ -215,10 +215,10 @@ jumbo_source_set("filters") {
      "//gpu/ipc/common",
      "//media/fuchsia/cdm",
      "//media/fuchsia/common",
-      "//third_party/fuchsia-sdk/sdk:media",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-media",
-      "//third_party/fuchsia-sdk/sdk:mediacodec",
+      "//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:sysmem",
      "//ui/ozone",
    ]
  }
@@ -323,8 +323,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:sysmem",
    ]
  }

--- a/media/fuchsia/cdm/BUILD.gn
+++ b/media/fuchsia/cdm/BUILD.gn
@@ -19,7 +19,7 @@ source_set("cdm") {
  ]
  public_deps = [
-    "//third_party/fuchsia-sdk/sdk:media_drm",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-media-drm",
  ]
  configs += [ "//media:subcomponent_config" ]

--- a/media/fuchsia/cdm/service/BUILD.gn
+++ b/media/fuchsia/cdm/service/BUILD.gn
@@ -11,7 +11,7 @@ source_set("service") {
  ]
  public_deps = [
-    "//third_party/fuchsia-sdk/sdk:media_drm",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-media-drm",
  ]
  deps = [

--- a/media/fuchsia/common/BUILD.gn
+++ b/media/fuchsia/common/BUILD.gn
@@ -21,7 +21,7 @@ source_set("common") {
  deps = [
    "//base",
    "//media/base",
-    "//third_party/fuchsia-sdk/sdk:media",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-media",
-    "//third_party/fuchsia-sdk/sdk:sysmem",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-sysmem",
  ]
 }
--- a/media/fuchsia/mojom/cdm_request.typemap
+++ b/media/fuchsia/mojom/cdm_request.typemap
@@ -11,6 +11,6 @@ sources = [
 ]
 public_deps = [
  "//fuchsia/mojom:traits",
-  "//third_party/fuchsia-sdk/sdk:media_drm",
+  "//third_party/fuchsia-sdk/sdk:fuchsia-media-drm",
 ]
 type_mappings = [ "media.mojom.CdmRequest=::fidl::InterfaceRequest<::fuchsia::media::drm::ContentDecryptionModule>[move_only]" ]
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -2279,8 +2279,8 @@ source_set("net_deps") {
    if (is_fuchsia) {
      public_deps += [
-        "//third_party/fuchsia-sdk/sdk:hardware_ethernet",
+        "//third_party/fuchsia-sdk/sdk:fuchsia-hardware-ethernet",
-        "//third_party/fuchsia-sdk/sdk:netstack",
+        "//third_party/fuchsia-sdk/sdk:fuchsia-netstack",
        "//third_party/fuchsia-sdk/sdk:sys_cpp",
      ]
    }
@@ -5891,7 +5891,7 @@ test("net_unittests") {
    use_test_server = true
    deps += [
      "//third_party/fuchsia-sdk/sdk:fidl_cpp",
-      "//third_party/fuchsia-sdk/sdk:netstack",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-netstack",
    ]
    sources += [ "base/network_change_notifier_fuchsia_unittest.cc" ]
  }

--- a/services/service_manager/sandbox/BUILD.gn
+++ b/services/service_manager/sandbox/BUILD.gn
@@ -110,14 +110,14 @@ component("sandbox") {
    ]
    deps += [
-      "//third_party/fuchsia-sdk/sdk:deprecatedtimezone",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-deprecatedtimezone",
-      "//third_party/fuchsia-sdk/sdk:fonts",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-fonts",
-      "//third_party/fuchsia-sdk/sdk:logger",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-logger",
-      "//third_party/fuchsia-sdk/sdk:mediacodec",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-mediacodec",
-      "//third_party/fuchsia-sdk/sdk:net",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-net",
-      "//third_party/fuchsia-sdk/sdk:netstack",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-netstack",
-      "//third_party/fuchsia-sdk/sdk:sysmem",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-sysmem",
-      "//third_party/fuchsia-sdk/sdk:ui_scenic",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-ui-scenic",
    ]
  }
 }

--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -470,10 +470,9 @@ component("skia") {
      "ext/fontmgr_default_fuchsia.cc",
    ]
    deps += [
-      "//third_party/fuchsia-sdk/sdk:fonts",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-fonts",
-      "//third_party/fuchsia-sdk/sdk:fonts",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-io",
-      "//third_party/fuchsia-sdk/sdk:io",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
-      "//third_party/fuchsia-sdk/sdk:sys",
      "//third_party/fuchsia-sdk/sdk:sys_cpp",
      "//third_party/fuchsia-sdk/sdk:zx",
      "//third_party/icu:icuuc",
@@ -901,9 +900,9 @@ source_set("test_fonts") {
      "ext/test_fonts_fuchsia.h",
    ]
    deps += [
-      "//third_party/fuchsia-sdk/sdk:fonts",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-fonts",
-      "//third_party/fuchsia-sdk/sdk:io",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-io",
-      "//third_party/fuchsia-sdk/sdk:sys",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-sys",
      "//third_party/fuchsia-sdk/sdk:sys_cpp",
    ]
  }
@@ -954,7 +953,7 @@ test("skia_unittests") {
  if (is_fuchsia) {
    sources += [ "ext/fontmgr_fuchsia_unittest.cc" ]
    deps += [
-      "//third_party/fuchsia-sdk/sdk:fonts",
+      "//third_party/fuchsia-sdk/sdk:fuchsia-fonts",
      "//third_party/test_fonts",
    ]
    data_deps = [

--- a/ui/base/ime/fuchsia/BUILD.gn
+++ b/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:ui_input",
    "//ui/base/ime",
    "//ui/events",
  ]

--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -400,7 +400,7 @@ jumbo_component("events") {
      "fuchsia/input_event_dispatcher_delegate.h",
    ]
    sources += [ "fuchsia/input_event_dispatcher.cc" ]
-    public_deps += [ "//third_party/fuchsia-sdk/sdk:ui_input" ]
+    public_deps += [ "//third_party/fuchsia-sdk/sdk:fuchsia-ui-input" ]
  }
 }
@@ -697,7 +697,7 @@ if (!is_ios) {
    if (is_fuchsia) {
      sources += [ "fuchsia/input_event_dispatcher_unittest.cc" ]
-      deps += [ "//third_party/fuchsia-sdk/sdk:ui_input" ]
+      deps += [ "//third_party/fuchsia-sdk/sdk:fuchsia-ui-input" ]
    }
    if (is_win || is_mac || use_ozone) {

--- a/ui/ozone/demo/BUILD.gn
+++ b/ui/ozone/demo/BUILD.gn
@@ -39,7 +39,7 @@ source_set("ozone_demo_lib") {
  ]
  if (is_fuchsia) {
-    deps += [ "//third_party/fuchsia-sdk/sdk:ui_policy" ]
+    deps += [ "//third_party/fuchsia-sdk/sdk:fuchsia-ui-policy" ]
  }
 }

--- a/ui/ozone/platform/scenic/BUILD.gn
+++ b/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:images",
+    "//third_party/fuchsia-sdk/sdk:fuchsia-images",
-    "//third_party/fuchsia-sdk/sdk:mem",
+    "//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:sysmem",
-    "//third_party/fuchsia-sdk/sdk:ui_gfx",
-    "//third_party/fuchsia-sdk/sdk:ui_scenic",
    "//ui/base",
    "//ui/base/ime/fuchsia",
    "//ui/display/fake",

--- a/ui/platform_window/BUILD.gn
+++ b/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:ui_policy",
-      "//third_party/fuchsia-sdk/sdk:ui_views",
    ]
  }
 }