Skip to content

Commit

Permalink
[fuchsia] Migrate to fully-qualified FIDL library target names.
Browse files Browse the repository at this point in the history
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/+/1937578
Reviewed-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}
  • Loading branch information
Wez authored and Commit Bot committed Nov 27, 2019
1 parent f4edd44 commit 500ab60
Show file tree
Hide file tree
Showing 22 changed files with 75 additions and 76 deletions.
10 changes: 5 additions & 5 deletions base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand All @@ -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",
]
Expand Down Expand Up @@ -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:sys",
"//third_party/fuchsia-sdk/sdk:fuchsia-logger",
"//third_party/fuchsia-sdk/sdk:fuchsia-sys",
"//third_party/fuchsia-sdk/sdk:sys_cpp",
]

Expand Down
4 changes: 2 additions & 2 deletions chromecast/media/cma/backend/fuchsia/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
}
Expand All @@ -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",
]
}
2 changes: 1 addition & 1 deletion chromecast/net/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion content/shell/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions fuchsia/base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ source_set("base") {
]
deps = [
"//base",
"//third_party/fuchsia-sdk/sdk:mem",
"//third_party/fuchsia-sdk/sdk:fuchsia-mem",
]
}

Expand All @@ -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",
]
}
Expand All @@ -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",
]
}

Expand All @@ -84,8 +84,8 @@ source_set("test_support") {
"//base",
"//net",
"//net:test_support",
"//third_party/fuchsia-sdk/sdk:modular",
"//third_party/fuchsia-sdk/sdk:web",
"//third_party/fuchsia-sdk/sdk:fuchsia-modular",
"//third_party/fuchsia-sdk/sdk:fuchsia-web",
"//url",
]
}
Expand Down
22 changes: 11 additions & 11 deletions fuchsia/engine/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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:math",
"//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: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",
Expand Down Expand Up @@ -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",
]
}
Expand All @@ -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",
]
Expand Down Expand Up @@ -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",
]
}

Expand All @@ -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",
Expand Down Expand Up @@ -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",
]
}
Expand Down
4 changes: 2 additions & 2 deletions fuchsia/http/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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:sys",
"//third_party/fuchsia-sdk/sdk:fuchsia-net-oldhttp",
"//third_party/fuchsia-sdk/sdk:fuchsia-sys",
"//third_party/fuchsia-sdk/sdk:sys_cpp",
]
visibility = [ ":*" ]
Expand Down
18 changes: 9 additions & 9 deletions fuchsia/runners/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [ ":*" ]
}
Expand All @@ -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 = [ ":*" ]
}
Expand Down Expand Up @@ -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 = [ ":*" ]
Expand All @@ -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",
]
}

Expand All @@ -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 = [ [
Expand Down Expand Up @@ -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 = [
[
Expand Down
2 changes: 1 addition & 1 deletion media/audio/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
}
Expand Down
8 changes: 4 additions & 4 deletions media/filters/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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:mediacodec",
"//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:sysmem",
"//ui/ozone",
]
}
Expand Down Expand Up @@ -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",
]
}

Expand Down
2 changes: 1 addition & 1 deletion media/fuchsia/cdm/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
2 changes: 1 addition & 1 deletion media/fuchsia/cdm/service/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
4 changes: 2 additions & 2 deletions media/fuchsia/common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ source_set("common") {
deps = [
"//base",
"//media/base",
"//third_party/fuchsia-sdk/sdk:media",
"//third_party/fuchsia-sdk/sdk:sysmem",
"//third_party/fuchsia-sdk/sdk:fuchsia-media",
"//third_party/fuchsia-sdk/sdk:fuchsia-sysmem",
]
}
2 changes: 1 addition & 1 deletion media/fuchsia/mojom/cdm_request.typemap
Original file line number Diff line number Diff line change
Expand Up @@ -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]" ]
6 changes: 3 additions & 3 deletions net/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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:netstack",
"//third_party/fuchsia-sdk/sdk:fuchsia-hardware-ethernet",
"//third_party/fuchsia-sdk/sdk:fuchsia-netstack",
"//third_party/fuchsia-sdk/sdk:sys_cpp",
]
}
Expand Down Expand Up @@ -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" ]
}
Expand Down
16 changes: 8 additions & 8 deletions services/service_manager/sandbox/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ component("sandbox") {
]

deps += [
"//third_party/fuchsia-sdk/sdk:deprecatedtimezone",
"//third_party/fuchsia-sdk/sdk:fonts",
"//third_party/fuchsia-sdk/sdk:logger",
"//third_party/fuchsia-sdk/sdk:mediacodec",
"//third_party/fuchsia-sdk/sdk:net",
"//third_party/fuchsia-sdk/sdk:netstack",
"//third_party/fuchsia-sdk/sdk:sysmem",
"//third_party/fuchsia-sdk/sdk:ui_scenic",
"//third_party/fuchsia-sdk/sdk:fuchsia-deprecatedtimezone",
"//third_party/fuchsia-sdk/sdk:fuchsia-fonts",
"//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",
]
}
}
Expand Down
Loading

0 comments on commit 500ab60

Please sign in to comment.