Skip to content

GitLab

T
tangled
Commit ba21444c authored by Wez's avatar Wez Committed by Commit Bot
Browse files
Options

[fuchsia] Migrate prebuilt & C++ library deps to use SDK targets. 

Migrate dependencies on SDK-provided prebuilt & C++ libraries to refer
directly to the SDK-provided GN targets, rather than the old Chromium-
generated rules.

TBR=jochen

Bug: 1050703
Change-Id: Ifc200463791e71763d04de3e3cdd394404bdfedb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2059008Reviewed-by: default avatarWez <wez@chromium.org>
Reviewed-by: default avatarSergey Ulanov <sergeyu@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742153}
parent e10f7afa
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 55 deletions
base/BUILD.gn
View file @ ba21444c
......@@ -1615,23 +1615,23 @@ jumbo_component("base") {
# by public //base headers, which requires they be on the include path.
# TODO(https://crbug.com/841171): Move these back to |deps|.
public_deps += [
"//third_party/fuchsia-sdk/sdk:async",
"//third_party/fuchsia-sdk/sdk:fdio",
"//third_party/fuchsia-sdk/sdk:fidl_cpp",
"//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",
"//third_party/fuchsia-sdk/sdk/pkg/async",
"//third_party/fuchsia-sdk/sdk/pkg/fdio",
"//third_party/fuchsia-sdk/sdk/pkg/fidl_cpp",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
"//third_party/fuchsia-sdk/sdk/pkg/zx",
]
deps += [
"//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:fidl",
"//third_party/fuchsia-sdk/sdk:syslog",
"//third_party/fuchsia-sdk/sdk:vfs_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
"//third_party/fuchsia-sdk/sdk/pkg/async-default",
"//third_party/fuchsia-sdk/sdk/pkg/async-loop-cpp",
"//third_party/fuchsia-sdk/sdk/pkg/async-loop-default",
"//third_party/fuchsia-sdk/sdk/pkg/fidl",
"//third_party/fuchsia-sdk/sdk/pkg/syslog",
"//third_party/fuchsia-sdk/sdk/pkg/vfs_cpp",
"//third_party/icu",
]
}
......@@ -3062,13 +3062,13 @@ test("base_unittests") {
deps += [
":test_interface_impl",
":testfidl",
"//third_party/fuchsia-sdk/sdk:async",
"//third_party/fuchsia-sdk/sdk:async-default",
"//third_party/fuchsia-sdk/sdk:fdio",
"//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",
"//third_party/fuchsia-sdk/sdk/pkg/async",
"//third_party/fuchsia-sdk/sdk/pkg/async-default",
"//third_party/fuchsia-sdk/sdk/pkg/fdio",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
manifest = "//build/config/fuchsia/tests.cmx"
......
base/test/BUILD.gn
View file @ ba21444c
......@@ -244,7 +244,7 @@ static_library("test_support") {
}
if (is_fuchsia) {
deps += [ "//third_party/fuchsia-sdk/sdk:zx" ]
deps += [ "//third_party/fuchsia-sdk/sdk/pkg/zx" ]
}
if (is_nacl_nonsfi) {
......
chromecast/media/cma/backend/fuchsia/BUILD.gn
View file @ ba21444c
......@@ -48,8 +48,8 @@ cast_source_set("mixer_output") {
"//chromecast/base",
"//chromecast/public/media",
"//media",
"//third_party/fuchsia-sdk/sdk:sys_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
}
......
chromecast/system/reboot/BUILD.gn
View file @ ba21444c
......@@ -57,9 +57,9 @@ if (is_fuchsia) {
public_deps = [ "//chromecast/public" ]
deps = [
"//base",
"//third_party/fuchsia-sdk/sdk:fidl",
"//third_party/fuchsia-sdk/sdk:fidl_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.hardware.power.statecontrol",
"//third_party/fuchsia-sdk/sdk/pkg/fidl",
"//third_party/fuchsia-sdk/sdk/pkg/fidl_cpp",
]
}
}
content/browser/BUILD.gn
View file @ ba21444c
......@@ -2019,7 +2019,7 @@ jumbo_source_set("browser") {
"child_process_launcher_helper_fuchsia.cc",
"speech/tts_fuchsia.cc",
]
deps += [ "//third_party/fuchsia-sdk/sdk:zx" ]
deps += [ "//third_party/fuchsia-sdk/sdk/pkg/zx" ]
} else if (is_posix) {
sources += [
"child_process_launcher_helper_posix.cc",
......
content/common/BUILD.gn
View file @ ba21444c
......@@ -411,7 +411,7 @@ source_set("common") {
if (is_fuchsia) {
sources += [ "font_list_fuchsia.cc" ]
deps += [ "//third_party/fuchsia-sdk/sdk:fdio" ]
deps += [ "//third_party/fuchsia-sdk/sdk/pkg/fdio" ]
}
if (use_clang_coverage_inside_sandbox) {
......
fuchsia/base/BUILD.gn
View file @ ba21444c
......@@ -41,8 +41,8 @@ source_set("modular") {
]
deps = [ "//base" ]
public_deps = [
"//third_party/fuchsia-sdk/sdk:sys_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
}
......
fuchsia/engine/BUILD.gn
View file @ ba21444c
......@@ -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: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/fuchsia-sdk/sdk/pkg/scenic_cpp",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
"//third_party/widevine/cdm:headers",
"//ui/accessibility",
"//ui/aura",
......@@ -265,8 +265,8 @@ test("web_engine_browsertests") {
"//net:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/fuchsia-sdk/sdk:scenic_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
"//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:scenic_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.accessibility.semantics",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
]
}
......@@ -348,10 +348,10 @@ executable("web_engine_shell_exec") {
deps = [
"//base",
"//fuchsia/base",
"//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",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
"//url",
]
}
......
fuchsia/http/BUILD.gn
View file @ ba21444c
......@@ -21,9 +21,9 @@ source_set("core") {
"//base:base",
"//fuchsia/base",
"//net:net",
"//third_party/fuchsia-sdk/sdk:sys_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.net.oldhttp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sys",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
visibility = [ ":*" ]
}
......
fuchsia/runners/BUILD.gn
View file @ ba21444c
......@@ -42,11 +42,11 @@ source_set("common") {
"//url",
]
public_deps = [
"//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",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
visibility = [ ":*" ]
}
......@@ -69,8 +69,8 @@ source_set("cast_runner_core") {
"//base",
"//fuchsia/base",
"//fuchsia/base:modular",
"//third_party/fuchsia-sdk/sdk:sys_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
"//url",
]
public_deps = [
......@@ -156,9 +156,9 @@ test("cast_runner_integration_tests") {
"//fuchsia/base:test_support",
"//net:test_support",
"//testing/gtest",
"//third_party/fuchsia-sdk/sdk:scenic_cpp",
"//third_party/fuchsia-sdk/sdk:sys_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.modular",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
package_deps = [ [
"//fuchsia/engine:web_engine",
......
gpu/vulkan/BUILD.gn
View file @ ba21444c
......@@ -80,7 +80,7 @@ if (enable_vulkan) {
if (is_fuchsia) {
sources += [ "fuchsia/vulkan_fuchsia_ext.h" ]
public_deps += [ "//third_party/fuchsia-sdk/sdk:zx" ]
public_deps += [ "//third_party/fuchsia-sdk/sdk/pkg/zx" ]
data_deps += [ "//third_party/fuchsia-sdk:vulkan_base" ]
......
media/audio/BUILD.gn
View file @ ba21444c
......@@ -296,8 +296,8 @@ source_set("audio") {
"fuchsia/audio_output_stream_fuchsia.h",
]
deps += [
"//third_party/fuchsia-sdk/sdk:sys_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
}
......
media/filters/BUILD.gn
View file @ ba21444c
......@@ -223,10 +223,10 @@ jumbo_source_set("filters") {
"//gpu/ipc/common",
"//media/fuchsia/cdm",
"//media/fuchsia/common",
"//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",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
"//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:sys_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sysmem",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
}
......
media/fuchsia/audio/BUILD.gn
View file @ ba21444c
......@@ -7,9 +7,9 @@ source_set("audio") {
"//base",
"//media",
"//media/fuchsia/mojom",
"//third_party/fuchsia-sdk/sdk:sys_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.media.audio",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
sources = [
......
mojo/core/BUILD.gn
View file @ ba21444c
......@@ -114,7 +114,7 @@ template("core_impl_source_set") {
if (is_fuchsia) {
sources += [ "channel_fuchsia.cc" ]
public_deps += [ "//third_party/fuchsia-sdk/sdk:fdio" ]
public_deps += [ "//third_party/fuchsia-sdk/sdk/pkg/fdio" ]
}
if (is_posix && !is_mac) {
......
mojo/public/cpp/platform/BUILD.gn
View file @ ba21444c
......@@ -42,8 +42,8 @@ component("platform") {
if (is_fuchsia) {
public_deps += [
"//third_party/fuchsia-sdk/sdk:fdio",
"//third_party/fuchsia-sdk/sdk:zx",
"//third_party/fuchsia-sdk/sdk/pkg/fdio",
"//third_party/fuchsia-sdk/sdk/pkg/zx",
]
}
......
net/BUILD.gn
View file @ ba21444c
......@@ -1698,9 +1698,9 @@ source_set("net_deps") {
if (is_fuchsia) {
public_deps += [
"//third_party/fuchsia-sdk/sdk:sys_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.hardware.ethernet",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.netstack",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
}
......@@ -4615,8 +4615,8 @@ test("net_unittests") {
if (is_fuchsia) {
use_test_server = true
deps += [
"//third_party/fuchsia-sdk/sdk:fidl_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.netstack",
"//third_party/fuchsia-sdk/sdk/pkg/fidl_cpp",
]
sources += [ "base/network_change_notifier_fuchsia_unittest.cc" ]
}
......
skia/BUILD.gn
View file @ ba21444c
......@@ -473,11 +473,11 @@ component("skia") {
"ext/fontmgr_default_fuchsia.cc",
]
deps += [
"//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/fuchsia-sdk/sdk/pkg/sys_cpp",
"//third_party/fuchsia-sdk/sdk/pkg/zx",
"//third_party/icu:icuuc",
]
}
......@@ -884,10 +884,10 @@ source_set("test_fonts") {
"ext/test_fonts_fuchsia.h",
]
deps += [
"//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",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
}
if (is_linux) {
......
third_party/fuchsia-sdk/BUILD.gn
View file @ ba21444c
......@@ -24,8 +24,8 @@ group("vulkan_base") {
data_deps = [
":vulkan_base_configs",
":vulkan_image_pipe",
"sdk:trace-engine",
"sdk:vulkan",
"sdk/pkg/trace-engine",
"sdk/pkg/vulkan",
]
}
......
third_party/googletest/BUILD.gn
View file @ ba21444c
......@@ -145,8 +145,8 @@ source_set("gtest") {
if (is_fuchsia) {
deps += [
"//third_party/fuchsia-sdk/sdk:fdio",
"//third_party/fuchsia-sdk/sdk:zx",
"//third_party/fuchsia-sdk/sdk/pkg/fdio",
"//third_party/fuchsia-sdk/sdk/pkg/zx",
]
}
}
......
ui/base/ime/fuchsia/BUILD.gn
View file @ ba21444c
......@@ -19,8 +19,8 @@ jumbo_component("fuchsia") {
defines = [ "IS_UI_BASE_IME_FUCHSIA_IMPL" ]
public_deps = [
"//third_party/fuchsia-sdk/sdk:sys_cpp",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.input",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
"//ui/base/ime",
"//ui/events",
]
......
ui/ozone/platform/scenic/BUILD.gn
View file @ ba21444c
......@@ -46,13 +46,13 @@ source_set("scenic") {
"//mojo/public/cpp/system",
"//services/service_manager/public/cpp",
"//skia",
"//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",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
"//ui/base",
"//ui/base/ime/fuchsia",
"//ui/display/fake",
......
ui/platform_window/BUILD.gn
View file @ ba21444c
......@@ -29,10 +29,10 @@ component("platform_window") {
]
public_deps = [
"//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",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
]
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment