[M102-LTS] Revert "Reland "diagnostics: Add connectivity unittest for healthd""
This reverts commit 9beceefe8a8670f0bc9ba8492eeef3c2a7a33f29.
Reason for revert: b/229389446
Original change's description:
> Reland "diagnostics: Add connectivity unittest for healthd"
>
> This is a reland of commit 1c92cb00c9d8375e96f005b54329e56739d9487d
>
> Original change's description:
> > diagnostics: Add connectivity unittest for healthd
> >
> > Add unittest to test the connectivity bindings for healthd public mojo
> > interface.
> > Note that this is the unit test to test the interface and the bindings
> > generator. The actual interface connectivity test will be added in
> > other CLs.
> >
> > BUG=b:209551761
> > TEST=FEATURES=test emerge-zork diagnostics
> >
> > Change-Id: I896458ffa44c5ac525fdc6702ded1e35fe8e477d
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3322821
> > Reviewed-by: Gavin Dodd <gavindodd@google.com>
> > Reviewed-by: Kerker Yang <kerker@chromium.org>
> > Commit-Queue: Chung-Sheng Wu <chungsheng@chromium.org>
> > Tested-by: Chung-Sheng Wu <chungsheng@chromium.org>
>
> Bug: b:209551761, b:220640184
> Cq-Depend: chromium:3524401
> Change-Id: If02c64be6fee2f2aaa4851eab5b6d6a5471c950c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3522303
> Tested-by: Chung-Sheng Wu <chungsheng@chromium.org>
> Reviewed-by: Kerker Yang <kerker@chromium.org>
> Commit-Queue: Chung-Sheng Wu <chungsheng@chromium.org>
Bug: b:209551761, b:220640184
Change-Id: Ie87fa8293c3c56639e9509dae8c52f4182b35176
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3593532
Tested-by: Chung-Sheng Wu <chungsheng@google.com>
Reviewed-by: Meng-Huan Yu <menghuan@chromium.org>
Commit-Queue: Chung-Sheng Wu <chungsheng@google.com>
(cherry picked from commit 29b90b25c0295310f75765610a3a93d0d4eacc84)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3821235
Reviewed-by: Oleh Lamzin <lamzin@google.com>
Owners-Override: Oleh Lamzin <lamzin@google.com>
Auto-Submit: Chung-Sheng Wu <chungsheng@google.com>
diff --git a/diagnostics/cros_healthd/BUILD.gn b/diagnostics/cros_healthd/BUILD.gn
index 09fd4b4..a94f034 100644
--- a/diagnostics/cros_healthd/BUILD.gn
+++ b/diagnostics/cros_healthd/BUILD.gn
@@ -60,7 +60,6 @@
executable("cros_healthd_test") {
run_test = true
sources = [
- "cros_healthd_connectivity_test.cc",
"cros_healthd_routine_service_test.cc",
"fake_cros_healthd_routine_factory.cc",
"routine_parameter_fetcher_test.cc",
@@ -87,7 +86,6 @@
"//diagnostics/cros_healthd/system:system_config_test",
"//diagnostics/cros_healthd/utils:libcros_healthd_utils_test",
"//diagnostics/cros_healthd_mojo_adapter:cros_healthd_mojo_adapter_test",
- "//diagnostics/mojom/public:cros_healthd_mojo_connectivity_bindings",
]
}
}
diff --git a/diagnostics/mojom/external/BUILD.gn b/diagnostics/mojom/external/BUILD.gn
index 5099b9e..92cea91 100644
--- a/diagnostics/mojom/external/BUILD.gn
+++ b/diagnostics/mojom/external/BUILD.gn
@@ -5,10 +5,6 @@
import("//common-mk/mojom_bindings_generator.gni")
import("//common-mk/pkg_config.gni")
-pkg_config("pkg_deps") {
- pkg_deps = [ "libchrome" ]
-}
-
generate_mojom_bindings("cros_healthd_internal") {
mojo_root = "${platform2_root}"
standalone = true
@@ -46,11 +42,3 @@
"network_types.mojom",
]
}
-
-source_set("mojo_connectivity_bindings_lib") {
- configs += [ ":pkg_deps" ]
- sources = [
- "time_mojom_data_generators.cc",
- "time_mojom_data_generators.h",
- ]
-}
diff --git a/diagnostics/mojom/external/generator_overrides.json b/diagnostics/mojom/external/generator_overrides.json
deleted file mode 100644
index 977d885e..0000000
--- a/diagnostics/mojom/external/generator_overrides.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "c++": {
- "mojo_base.mojom.Time": {
- "generator_typename": "diagnostics::BaseTimeGenerator",
- "generator_headers": [
- "diagnostics/mojom/external/time_mojom_data_generators.h"
- ]
- },
- "mojo_base.mojom.TimeDelta": {
- "generator_typename": "diagnostics::BaseTimeDeltaGenerator",
- "generator_headers": [
- "diagnostics/mojom/external/time_mojom_data_generators.h"
- ]
- }
- }
-}
diff --git a/diagnostics/mojom/public/BUILD.gn b/diagnostics/mojom/public/BUILD.gn
index b42db70..a2afbf2 100644
--- a/diagnostics/mojom/public/BUILD.gn
+++ b/diagnostics/mojom/public/BUILD.gn
@@ -4,7 +4,6 @@
import("//common-mk/mojom_bindings_generator.gni")
import("//common-mk/pkg_config.gni")
-import("//diagnostics/bindings/connectivity/generator.gni")
generate_mojom_bindings("cros_healthd_mojo_bindings") {
mojo_root = "${platform2_root}"
@@ -28,25 +27,3 @@
sources = [ "wilco_dtc_supportd.mojom" ]
deps = [ ":cros_healthd_mojo_bindings" ]
}
-
-mojom_connectivity("cros_healthd_mojo_connectivity_bindings") {
- mojo_root = "${platform2_root}"
- generator_overrides =
- [ "//diagnostics/mojom/external/generator_overrides.json" ]
- deps = [
- ":cros_healthd_mojo_bindings",
- "//diagnostics/mojom/external:mojo_connectivity_bindings_lib",
- ]
- sources = [
- "//diagnostics/mojom/external/network_diagnostics.mojom",
- "//diagnostics/mojom/external/network_health.mojom",
- "//diagnostics/mojom/external/network_types.mojom",
- "//diagnostics/mojom/external/time.mojom",
- "cros_healthd.mojom",
- "cros_healthd_diagnostics.mojom",
- "cros_healthd_events.mojom",
- "cros_healthd_probe.mojom",
- "nullable_primitives.mojom",
- "wilco_ec.mojom",
- ]
-}
