[banjo] Migrate fuchsia.hardware.sysmem to FIDL.
Bug: 72629
Change-Id: I9eda7458fddd3769c05434a2108eba8f7f1da427
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/512632
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Fuchsia-Auto-Submit: Suraj Malhotra <surajmalhotra@google.com>
Reviewed-by: Abdulla Kamar <abdulla@google.com>
diff --git a/sdk/banjo/BUILD.gn b/sdk/banjo/BUILD.gn
index 6d6d408..0bba945 100644
--- a/sdk/banjo/BUILD.gn
+++ b/sdk/banjo/BUILD.gn
@@ -83,7 +83,6 @@
"fuchsia.hardware.shareddma",
"fuchsia.hardware.spiimpl",
"fuchsia.hardware.syscalls.pci",
- "fuchsia.hardware.sysmem",
"fuchsia.hardware.tee",
"fuchsia.hardware.test",
"fuchsia.hardware.thermal",
diff --git a/sdk/banjo/fuchsia.hardware.sysmem/BUILD.gn b/sdk/banjo/fuchsia.hardware.sysmem/BUILD.gn
index 236b19da..498b19a 100644
--- a/sdk/banjo/fuchsia.hardware.sysmem/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.sysmem/BUILD.gn
@@ -5,10 +5,11 @@
import("//build/banjo/banjo.gni")
banjo("fuchsia.hardware.sysmem") {
+ fidl_only = true
sources = [ "sysmem.banjo" ]
deps = [ "//sdk/banjo/zx" ]
}
group("fuchsia.hardware.sysmem_banjo_cpp") {
- public_deps = [ ":fuchsia.hardware.sysmem" ]
+ public_deps = [ ":fuchsia.hardware.sysmem_banjo_cpp_2" ]
}
diff --git a/src/camera/drivers/controller/BUILD.gn b/src/camera/drivers/controller/BUILD.gn
index bc72894..5656d0e 100644
--- a/src/camera/drivers/controller/BUILD.gn
+++ b/src/camera/drivers/controller/BUILD.gn
@@ -58,7 +58,7 @@
"//sdk/banjo/fuchsia.hardware.ge2d",
"//sdk/banjo/fuchsia.hardware.isp",
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.camera2",
"//sdk/fidl/fuchsia.camera2.hal",
diff --git a/src/camera/drivers/controller/luis/BUILD.gn b/src/camera/drivers/controller/luis/BUILD.gn
index 2d040cb..23ec500 100644
--- a/src/camera/drivers/controller/luis/BUILD.gn
+++ b/src/camera/drivers/controller/luis/BUILD.gn
@@ -20,7 +20,7 @@
]
public_deps = [
"//sdk/banjo/fuchsia.hardware.ge2d",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.camera2",
"//sdk/fidl/fuchsia.camera2.hal",
"//src/camera/drivers/controller/configs",
diff --git a/src/camera/drivers/controller/sherlock/BUILD.gn b/src/camera/drivers/controller/sherlock/BUILD.gn
index 7b84826..c284b94 100644
--- a/src/camera/drivers/controller/sherlock/BUILD.gn
+++ b/src/camera/drivers/controller/sherlock/BUILD.gn
@@ -30,7 +30,7 @@
]
public_deps = [
"//sdk/banjo/fuchsia.hardware.ge2d",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.camera2",
"//sdk/fidl/fuchsia.camera2.hal",
"//src/camera/drivers/controller/configs",
diff --git a/src/camera/drivers/hw_accel/gdc/BUILD.gn b/src/camera/drivers/hw_accel/gdc/BUILD.gn
index e70da72..85f2558 100644
--- a/src/camera/drivers/hw_accel/gdc/BUILD.gn
+++ b/src/camera/drivers/hw_accel/gdc/BUILD.gn
@@ -37,7 +37,7 @@
"//sdk/banjo/fuchsia.hardware.gdc",
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
"//sdk/lib/fit",
"//sdk/lib/syslog/cpp",
diff --git a/src/camera/drivers/hw_accel/ge2d/BUILD.gn b/src/camera/drivers/hw_accel/ge2d/BUILD.gn
index 9abce19..55c95ee 100644
--- a/src/camera/drivers/hw_accel/ge2d/BUILD.gn
+++ b/src/camera/drivers/hw_accel/ge2d/BUILD.gn
@@ -34,7 +34,7 @@
"//sdk/banjo/fuchsia.hardware.ge2d",
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
"//sdk/lib/syslog/cpp",
"//src/camera/drivers/hw_accel/task:camera-task",
@@ -97,7 +97,7 @@
":lib",
"//sdk/banjo/fuchsia.hardware.amlogiccanvas",
"//sdk/banjo/fuchsia.hardware.ge2d",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
"//src/camera/drivers/test_utils",
"//src/devices/lib/driver",
diff --git a/src/camera/lib/format_conversion/BUILD.gn b/src/camera/lib/format_conversion/BUILD.gn
index 3318d86..0885f2d1 100644
--- a/src/camera/lib/format_conversion/BUILD.gn
+++ b/src/camera/lib/format_conversion/BUILD.gn
@@ -9,7 +9,7 @@
]
deps = [
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysmem",
"//zircon/system/ulib/image-format",
]
diff --git a/src/devices/board/drivers/x86/BUILD.gn b/src/devices/board/drivers/x86/BUILD.gn
index 1ca496d..55eb646 100644
--- a/src/devices/board/drivers/x86/BUILD.gn
+++ b/src/devices/board/drivers/x86/BUILD.gn
@@ -108,7 +108,7 @@
"//sdk/banjo/fuchsia.hardware.pciroot",
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/banjo/fuchsia.sysmem",
"//sdk/fidl/fuchsia.hardware.acpi:fuchsia.hardware.acpi_llcpp",
"//sdk/fidl/fuchsia.hardware.power:fuchsia.hardware.power_c",
@@ -150,7 +150,7 @@
"//sdk/banjo/fuchsia.hardware.pciroot",
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.hardware.power:fuchsia.hardware.power_c",
"//sdk/fidl/fuchsia.hardware.thermal:fuchsia.hardware.thermal_c",
"//sdk/lib/fdio",
@@ -206,7 +206,7 @@
"//sdk/banjo/fuchsia.hardware.hidbus",
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.hardware.power:fuchsia.hardware.power_c",
"//sdk/lib/fdio",
"//src/lib/ddk",
diff --git a/src/devices/bus/drivers/pci/BUILD.gn b/src/devices/bus/drivers/pci/BUILD.gn
index efd4abf..4eea194 100644
--- a/src/devices/bus/drivers/pci/BUILD.gn
+++ b/src/devices/bus/drivers/pci/BUILD.gn
@@ -64,7 +64,7 @@
public_deps = [
":pci_proxy_bind",
"//sdk/banjo/fuchsia.hardware.pci",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//src/devices/lib/driver",
"//src/devices/pci/lib/pci",
"//src/lib/ddk",
@@ -135,7 +135,7 @@
"//sdk/banjo/fuchsia.hardware.pci",
"//sdk/banjo/fuchsia.hardware.pciroot",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//src/devices/lib/driver",
"//src/devices/lib/pci",
"//src/devices/pci/lib/pci",
@@ -158,7 +158,7 @@
"//sdk/banjo/fuchsia.hardware.pci",
"//sdk/banjo/fuchsia.hardware.pciroot",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//src/devices/lib/driver",
"//src/devices/lib/pci",
"//src/devices/pci/lib/pci",
diff --git a/src/devices/bus/drivers/platform/BUILD.gn b/src/devices/bus/drivers/platform/BUILD.gn
index 27fe12f..618d8e0 100644
--- a/src/devices/bus/drivers/platform/BUILD.gn
+++ b/src/devices/bus/drivers/platform/BUILD.gn
@@ -35,7 +35,7 @@
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.powerimpl",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.boot:fuchsia.boot_llcpp",
"//sdk/fidl/fuchsia.sysinfo:fuchsia.sysinfo_llcpp",
"//sdk/lib/fdio",
@@ -89,7 +89,7 @@
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.powerimpl",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.boot:fuchsia.boot_llcpp",
"//sdk/fidl/fuchsia.sysinfo:fuchsia.sysinfo_llcpp",
"//sdk/lib/fdio",
diff --git a/src/devices/internal/drivers/fragment/BUILD.gn b/src/devices/internal/drivers/fragment/BUILD.gn
index 3ab4d65..a51220d 100644
--- a/src/devices/internal/drivers/fragment/BUILD.gn
+++ b/src/devices/internal/drivers/fragment/BUILD.gn
@@ -47,7 +47,7 @@
"//sdk/banjo/fuchsia.hardware.sdio",
"//sdk/banjo/fuchsia.hardware.shareddma",
"//sdk/banjo/fuchsia.hardware.spi:fuchsia.hardware.spi_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.tee",
"//sdk/banjo/fuchsia.hardware.thermal",
"//sdk/banjo/fuchsia.hardware.usb.modeswitch",
@@ -96,7 +96,7 @@
"//sdk/banjo/fuchsia.hardware.registers",
"//sdk/banjo/fuchsia.hardware.rpmb",
"//sdk/banjo/fuchsia.hardware.spi:fuchsia.hardware.spi_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.tee",
"//sdk/banjo/fuchsia.hardware.usb.modeswitch",
"//sdk/banjo/fuchsia.hardware.vreg",
diff --git a/src/devices/securemem/drivers/aml-securemem/BUILD.gn b/src/devices/securemem/drivers/aml-securemem/BUILD.gn
index 30aab14..51734a01 100644
--- a/src/devices/securemem/drivers/aml-securemem/BUILD.gn
+++ b/src/devices/securemem/drivers/aml-securemem/BUILD.gn
@@ -40,7 +40,7 @@
deps = [
":aml-securemem-bind",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.tee",
"//sdk/fidl/fuchsia.hardware.securemem:fuchsia.hardware.securemem_llcpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_llcpp",
@@ -82,7 +82,7 @@
deps = [
":aml-securemem-bind",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.tee",
"//sdk/fidl/fuchsia.hardware.securemem:fuchsia.hardware.securemem_llcpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_llcpp",
diff --git a/src/devices/sysmem/drivers/sysmem/BUILD.gn b/src/devices/sysmem/drivers/sysmem/BUILD.gn
index 1138b59..cc01d0f 100644
--- a/src/devices/sysmem/drivers/sysmem/BUILD.gn
+++ b/src/devices/sysmem/drivers/sysmem/BUILD.gn
@@ -47,7 +47,7 @@
public_deps = [
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/banjo/fuchsia.sysmem",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_llcpp",
"//sdk/fidl/fuchsia.sysmem2:fuchsia.sysmem2_llcpp",
@@ -120,7 +120,7 @@
":sysmem_common_srcs",
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
"//sdk/lib/fit",
"//src/devices/bus/testing/fake-pdev",
diff --git a/src/devices/sysmem/tests/sysmem/fuzz/BUILD.gn b/src/devices/sysmem/tests/sysmem/fuzz/BUILD.gn
index 4196ebe..0911297 100644
--- a/src/devices/sysmem/tests/sysmem/fuzz/BUILD.gn
+++ b/src/devices/sysmem/tests/sysmem/fuzz/BUILD.gn
@@ -36,7 +36,7 @@
deps = [
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/banjo/fuchsia.sysmem",
"//sdk/fidl/fuchsia.sysinfo:fuchsia.sysinfo_c",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
@@ -91,7 +91,7 @@
deps = [
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysinfo:fuchsia.sysinfo_c",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_llcpp",
diff --git a/src/devices/tee/drivers/optee/BUILD.gn b/src/devices/tee/drivers/optee/BUILD.gn
index 9dd7f8d..19016f0 100644
--- a/src/devices/tee/drivers/optee/BUILD.gn
+++ b/src/devices/tee/drivers/optee/BUILD.gn
@@ -44,7 +44,7 @@
deps = [
":optee-bind",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.tee",
"//sdk/fidl/fuchsia.tee:fuchsia.tee_llcpp",
"//sdk/fidl/fuchsia.tee.manager:fuchsia.tee.manager_llcpp",
@@ -92,7 +92,7 @@
output_name = "optee-controller-test"
deps = [
":optee_lib",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//src/devices/testing/fake-bti",
"//src/devices/testing/fake-resource",
"//src/devices/testing/fake_ddk",
@@ -106,7 +106,7 @@
output_name = "optee-client-test"
deps = [
":optee_lib",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/lib/fidl/cpp",
"//src/devices/testing/fake-bti",
"//src/devices/testing/fake-resource",
diff --git a/src/graphics/display/drivers/amlogic-display/BUILD.gn b/src/graphics/display/drivers/amlogic-display/BUILD.gn
index 608fb6e..07e0de3 100644
--- a/src/graphics/display/drivers/amlogic-display/BUILD.gn
+++ b/src/graphics/display/drivers/amlogic-display/BUILD.gn
@@ -43,7 +43,7 @@
"//sdk/banjo/fuchsia.hardware.gpio:fuchsia.hardware.gpio_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.i2cimpl",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_llcpp",
"//src/devices/bus/lib/device-protocol-pdev",
"//src/devices/bus/lib/device-protocol-platform-device",
diff --git a/src/graphics/display/drivers/display/tests/BUILD.gn b/src/graphics/display/drivers/display/tests/BUILD.gn
index 55815e6..8f344ee 100644
--- a/src/graphics/display/drivers/display/tests/BUILD.gn
+++ b/src/graphics/display/drivers/display/tests/BUILD.gn
@@ -22,7 +22,7 @@
deps = [
":base",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.hardware.display:fuchsia.hardware.display_llcpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_llcpp",
"//src/devices/testing/fake_ddk",
@@ -48,7 +48,7 @@
deps = [
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//src/lib/fsl",
]
public_deps = [
diff --git a/src/graphics/display/drivers/dsi-dw/BUILD.gn b/src/graphics/display/drivers/dsi-dw/BUILD.gn
index ae8512f..778a57c 100644
--- a/src/graphics/display/drivers/dsi-dw/BUILD.gn
+++ b/src/graphics/display/drivers/dsi-dw/BUILD.gn
@@ -29,7 +29,7 @@
"//sdk/banjo/fuchsia.hardware.i2c",
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.hardware.dsi:fuchsia.hardware.dsi_llcpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
"//src/devices/bus/lib/device-protocol-pdev",
diff --git a/src/graphics/display/drivers/dsi-mt/BUILD.gn b/src/graphics/display/drivers/dsi-mt/BUILD.gn
index 2c96ac8..25acee3 100644
--- a/src/graphics/display/drivers/dsi-mt/BUILD.gn
+++ b/src/graphics/display/drivers/dsi-mt/BUILD.gn
@@ -29,7 +29,7 @@
"//sdk/banjo/fuchsia.hardware.i2c",
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
"//src/devices/bus/lib/device-protocol-pdev",
"//src/devices/bus/lib/device-protocol-platform-device",
diff --git a/src/graphics/display/drivers/fake/BUILD.gn b/src/graphics/display/drivers/fake/BUILD.gn
index 86f03c2..61b71ea 100644
--- a/src/graphics/display/drivers/fake/BUILD.gn
+++ b/src/graphics/display/drivers/fake/BUILD.gn
@@ -42,7 +42,7 @@
"//sdk/banjo/fuchsia.hardware.display.capture",
"//sdk/banjo/fuchsia.hardware.display.clamprgb",
"//sdk/banjo/fuchsia.hardware.display.controller",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
"//src/devices/bus/lib/device-protocol-pdev",
"//src/lib/ddk",
diff --git a/src/graphics/display/drivers/goldfish-display/BUILD.gn b/src/graphics/display/drivers/goldfish-display/BUILD.gn
index 8c9693f..a19b943 100644
--- a/src/graphics/display/drivers/goldfish-display/BUILD.gn
+++ b/src/graphics/display/drivers/goldfish-display/BUILD.gn
@@ -36,7 +36,7 @@
"//sdk/banjo/fuchsia.hardware.display.controller",
"//sdk/banjo/fuchsia.hardware.goldfish.control",
"//sdk/banjo/fuchsia.hardware.goldfish.pipe",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.hardware.goldfish:fuchsia.hardware.goldfish_llcpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
"//src/lib/ddk",
diff --git a/src/graphics/display/drivers/intel-i915/BUILD.gn b/src/graphics/display/drivers/intel-i915/BUILD.gn
index c7305ed..9c611db 100644
--- a/src/graphics/display/drivers/intel-i915/BUILD.gn
+++ b/src/graphics/display/drivers/intel-i915/BUILD.gn
@@ -37,7 +37,7 @@
"//sdk/banjo/fuchsia.hardware.i2cimpl",
"//sdk/banjo/fuchsia.hardware.intelgpucore",
"//sdk/banjo/fuchsia.hardware.pci",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.hardware.backlight:fuchsia.hardware.backlight_llcpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
"//src/devices/lib/driver",
diff --git a/src/graphics/display/drivers/mt8167s-display/BUILD.gn b/src/graphics/display/drivers/mt8167s-display/BUILD.gn
index 1bd1ec4..6135dbe 100644
--- a/src/graphics/display/drivers/mt8167s-display/BUILD.gn
+++ b/src/graphics/display/drivers/mt8167s-display/BUILD.gn
@@ -51,7 +51,7 @@
"//sdk/banjo/fuchsia.hardware.gpio:fuchsia.hardware.gpio_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.power",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_llcpp",
"//src/devices/bus/lib/device-protocol-pdev",
"//src/devices/bus/lib/device-protocol-platform-device",
diff --git a/src/graphics/display/drivers/vim-display/BUILD.gn b/src/graphics/display/drivers/vim-display/BUILD.gn
index ad5b309..8a8e0e1 100644
--- a/src/graphics/display/drivers/vim-display/BUILD.gn
+++ b/src/graphics/display/drivers/vim-display/BUILD.gn
@@ -23,7 +23,7 @@
"//sdk/banjo/fuchsia.hardware.gpio:fuchsia.hardware.gpio_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.i2cimpl",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_c",
"//src/devices/bus/lib/device-protocol-pdev",
"//src/devices/bus/lib/device-protocol-platform-device",
diff --git a/src/graphics/drivers/aml-gpu/BUILD.gn b/src/graphics/drivers/aml-gpu/BUILD.gn
index bf6c2cb..fa4ef6f 100644
--- a/src/graphics/drivers/aml-gpu/BUILD.gn
+++ b/src/graphics/drivers/aml-gpu/BUILD.gn
@@ -38,7 +38,7 @@
"//sdk/banjo/fuchsia.hardware.platform.bus:fuchsia.hardware.platform.bus_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.registers",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.hardware.gpu.amlogic:fuchsia.hardware.gpu.amlogic_llcpp",
"//sdk/fidl/fuchsia.hardware.gpu.clock:fuchsia.hardware.gpu.clock_c",
"//sdk/fidl/fuchsia.hardware.registers:fuchsia.hardware.registers_llcpp",
diff --git a/src/graphics/drivers/virtio/BUILD.gn b/src/graphics/drivers/virtio/BUILD.gn
index b1087ba..66b0554 100644
--- a/src/graphics/drivers/virtio/BUILD.gn
+++ b/src/graphics/drivers/virtio/BUILD.gn
@@ -27,7 +27,7 @@
sources = [ "gpu.cc" ]
public_deps = [
"//sdk/banjo/fuchsia.hardware.display.controller",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/fidl/fuchsia.sysmem:fuchsia.sysmem_llcpp",
"//src/devices/bus/lib/virtio",
"//src/lib/ddktl",
diff --git a/src/media/drivers/amlogic_decoder/BUILD.gn b/src/media/drivers/amlogic_decoder/BUILD.gn
index 711992d..165bb8c 100644
--- a/src/media/drivers/amlogic_decoder/BUILD.gn
+++ b/src/media/drivers/amlogic_decoder/BUILD.gn
@@ -163,7 +163,7 @@
"//sdk/banjo/fuchsia.hardware.amlogiccanvas",
"//sdk/banjo/fuchsia.hardware.clock:fuchsia.hardware.clock_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.platform.device:fuchsia.hardware.platform.device_banjo_cpp",
- "//sdk/banjo/fuchsia.hardware.sysmem",
+ "//sdk/banjo/fuchsia.hardware.sysmem:fuchsia.hardware.sysmem_banjo_cpp",
"//sdk/banjo/fuchsia.hardware.tee",
"//sdk/fidl/fuchsia.hardware.mediacodec:fuchsia.hardware.mediacodec_llcpp",
"//sdk/fidl/fuchsia.tee",
