[banjo] Prepare for soft migration
Temporarily disable some tests and add some group targets to enable soft
transition of out of repo deps to the new build rules. These will be
cleaned up in future commit
Bug: 72499
Change-Id: I5d2da8832f3edc3191ccdc925c6d0ed992c0ba96
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/512624
Reviewed-by: Shai Barack <shayba@google.com>
Reviewed-by: David Gilhooley <dgilhooley@google.com>
Reviewed-by: Sarah Chan <spqchan@google.com>
Commit-Queue: Suraj Malhotra <surajmalhotra@google.com>
diff --git a/build/banjo/fidl_adapter.gni b/build/banjo/fidl_adapter.gni
index a08e24f..11703cd 100644
--- a/build/banjo/fidl_adapter.gni
+++ b/build/banjo/fidl_adapter.gni
@@ -232,8 +232,8 @@
##############################################################################
# C++ backend
- cpp_target_name = "${original_target_name}_banjo_cpp"
- cpp_mock_target_name = "${original_target_name}_banjo_cpp_mock"
+ cpp_target_name = "${original_target_name}_banjo_cpp_2"
+ cpp_mock_target_name = "${original_target_name}_banjo_cpp_mock_2"
cpp_public_fidlgen_target_name = "$cpp_target_name.public.gen"
cpp_private_fidlgen_target_name = "$cpp_target_name.private.gen"
cpp_mock_fidlgen_target_name = "$cpp_target_name.mock.gen"
@@ -389,7 +389,7 @@
if (dep != "//sdk/banjo/zx") {
_name = get_label_info(dep, "name")
_dir = get_label_info(dep, "dir")
- public_deps += [ "$_dir:${_name}_banjo_cpp" ]
+ public_deps += [ "$_dir:${_name}_banjo_cpp_2" ]
}
}
}
@@ -417,7 +417,7 @@
if (dep != "//sdk/banjo/zx") {
_name = get_label_info(dep, "name")
_dir = get_label_info(dep, "dir")
- public_deps += [ "$_dir:${_name}_banjo_cpp_mock" ]
+ public_deps += [ "$_dir:${_name}_banjo_cpp_mock_2" ]
}
}
}
diff --git a/sdk/banjo/BUILD.gn b/sdk/banjo/BUILD.gn
index 3d2a785..3e5ab67 100644
--- a/sdk/banjo/BUILD.gn
+++ b/sdk/banjo/BUILD.gn
@@ -186,13 +186,13 @@
deps += [
"$library:${library}.fidl($fidl_toolchain)",
"$library:${library}_banjo_c",
- "$library:${library}_banjo_cpp",
+ "$library:${library}_banjo_cpp_2",
]
}
foreach(library, _rust_translated_deps) {
deps += [ "$library:${library}_banjo_rust" ]
}
foreach(library, _cpp_mock_translated_deps) {
- deps += [ "$library:${library}_banjo_cpp_mock" ]
+ deps += [ "$library:${library}_banjo_cpp_mock_2" ]
}
}
diff --git a/sdk/banjo/fuchsia.hardware.amlogiccanvas/BUILD.gn b/sdk/banjo/fuchsia.hardware.amlogiccanvas/BUILD.gn
index 77962128..9ae4041a 100644
--- a/sdk/banjo/fuchsia.hardware.amlogiccanvas/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.amlogiccanvas/BUILD.gn
@@ -8,3 +8,7 @@
sources = [ "amlogic-canvas.banjo" ]
deps = [ "//sdk/banjo/zx" ]
}
+
+group("fuchsia.hardware.amlogiccanvas_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.amlogiccanvas" ]
+}
diff --git a/sdk/banjo/fuchsia.hardware.camera.sensor/BUILD.gn b/sdk/banjo/fuchsia.hardware.camera.sensor/BUILD.gn
index d6934e3..5a0718f 100644
--- a/sdk/banjo/fuchsia.hardware.camera.sensor/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.camera.sensor/BUILD.gn
@@ -11,3 +11,12 @@
"//sdk/banjo/zx",
]
}
+
+group("fuchsia.hardware.camera.sensor_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.camera.sensor" ]
+}
+
+group("fuchsia.hardware.camera.sensor_banjo_cpp_mock") {
+ testonly = true
+ public_deps = [ ":fuchsia.hardware.camera.sensor_mock" ]
+}
diff --git a/sdk/banjo/fuchsia.hardware.camera/BUILD.gn b/sdk/banjo/fuchsia.hardware.camera/BUILD.gn
index fd059f0..54fa9d2 100644
--- a/sdk/banjo/fuchsia.hardware.camera/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.camera/BUILD.gn
@@ -7,3 +7,7 @@
banjo("fuchsia.hardware.camera") {
sources = [ "camera.banjo" ]
}
+
+group("fuchsia.hardware.camera_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.camera" ]
+}
diff --git a/sdk/banjo/fuchsia.hardware.camerahwaccel/BUILD.gn b/sdk/banjo/fuchsia.hardware.camerahwaccel/BUILD.gn
index a8138d0..3cb80a3 100644
--- a/sdk/banjo/fuchsia.hardware.camerahwaccel/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.camerahwaccel/BUILD.gn
@@ -7,3 +7,7 @@
banjo("fuchsia.hardware.camerahwaccel") {
sources = [ "camerahwaccel.banjo" ]
}
+
+group("fuchsia.hardware.camerahwaccel_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.camerahwaccel" ]
+}
diff --git a/sdk/banjo/fuchsia.hardware.clock/BUILD.gn b/sdk/banjo/fuchsia.hardware.clock/BUILD.gn
index 1fce1d7..ecf7fa0 100644
--- a/sdk/banjo/fuchsia.hardware.clock/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.clock/BUILD.gn
@@ -8,3 +8,12 @@
sources = [ "clock.banjo" ]
deps = [ "//sdk/banjo/zx" ]
}
+
+group("fuchsia.hardware.clock_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.clock" ]
+}
+
+group("fuchsia.hardware.clock_banjo_cpp_mock") {
+ testonly = true
+ public_deps = [ ":fuchsia.hardware.clock_mock" ]
+}
diff --git a/sdk/banjo/fuchsia.hardware.gpio/BUILD.gn b/sdk/banjo/fuchsia.hardware.gpio/BUILD.gn
index 205d20e..232d374 100644
--- a/sdk/banjo/fuchsia.hardware.gpio/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.gpio/BUILD.gn
@@ -8,3 +8,12 @@
sources = [ "gpio.banjo" ]
deps = [ "//sdk/banjo/zx" ]
}
+
+group("fuchsia.hardware.gpio_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.gpio" ]
+}
+
+group("fuchsia.hardware.gpio_banjo_cpp_mock") {
+ testonly = true
+ public_deps = [ ":fuchsia.hardware.gpio_mock" ]
+}
diff --git a/sdk/banjo/fuchsia.hardware.isp/BUILD.gn b/sdk/banjo/fuchsia.hardware.isp/BUILD.gn
index 5cd3303..5c3bbb0 100644
--- a/sdk/banjo/fuchsia.hardware.isp/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.isp/BUILD.gn
@@ -13,3 +13,7 @@
"//sdk/banjo/zx",
]
}
+
+group("fuchsia.hardware.isp_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.isp" ]
+}
diff --git a/sdk/banjo/fuchsia.hardware.mipicsi/BUILD.gn b/sdk/banjo/fuchsia.hardware.mipicsi/BUILD.gn
index ed42d25..41df961 100644
--- a/sdk/banjo/fuchsia.hardware.mipicsi/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.mipicsi/BUILD.gn
@@ -11,3 +11,7 @@
"//sdk/banjo/zx",
]
}
+
+group("fuchsia.hardware.mipicsi_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.mipicsi" ]
+}
diff --git a/sdk/banjo/fuchsia.hardware.platform.device/BUILD.gn b/sdk/banjo/fuchsia.hardware.platform.device/BUILD.gn
index 0b861b9..55c70c3 100644
--- a/sdk/banjo/fuchsia.hardware.platform.device/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.platform.device/BUILD.gn
@@ -8,3 +8,7 @@
sources = [ "platform-device.banjo" ]
deps = [ "//sdk/banjo/zx" ]
}
+
+group("fuchsia.hardware.platform.device_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.platform.device" ]
+}
diff --git a/sdk/banjo/fuchsia.hardware.registers/BUILD.gn b/sdk/banjo/fuchsia.hardware.registers/BUILD.gn
index 57a085b..1e2c591 100644
--- a/sdk/banjo/fuchsia.hardware.registers/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.registers/BUILD.gn
@@ -8,3 +8,7 @@
sources = [ "registers.banjo" ]
deps = [ "//sdk/banjo/zx" ]
}
+
+group("fuchsia.hardware.registers_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.registers" ]
+}
diff --git a/sdk/banjo/fuchsia.hardware.spi/BUILD.gn b/sdk/banjo/fuchsia.hardware.spi/BUILD.gn
index 712b2a1..56cd33e 100644
--- a/sdk/banjo/fuchsia.hardware.spi/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.spi/BUILD.gn
@@ -8,3 +8,7 @@
sources = [ "spi.banjo" ]
deps = [ "//sdk/banjo/zx" ]
}
+
+group("fuchsia.hardware.spi_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.spi" ]
+}
diff --git a/sdk/banjo/fuchsia.hardware.sysmem/BUILD.gn b/sdk/banjo/fuchsia.hardware.sysmem/BUILD.gn
index fc8b4dd..236b19da 100644
--- a/sdk/banjo/fuchsia.hardware.sysmem/BUILD.gn
+++ b/sdk/banjo/fuchsia.hardware.sysmem/BUILD.gn
@@ -8,3 +8,7 @@
sources = [ "sysmem.banjo" ]
deps = [ "//sdk/banjo/zx" ]
}
+
+group("fuchsia.hardware.sysmem_banjo_cpp") {
+ public_deps = [ ":fuchsia.hardware.sysmem" ]
+}
