Refactor BUILD.gn from dwa to private_metrics This CL moves dwa/BUILD.gn to private_metrics/BUILD.gn and fixes the references in the Chromium code base. Bug: 433729993 Change-Id: Icb18514dc83b9a1cd6099caa96dd9f53e1481f2b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6966657 Reviewed-by: Caitlin Fischer <caitlinfischer@google.com> Commit-Queue: Jay Zhou <zhouzj@google.com> Reviewed-by: Colin Blundell <blundell@chromium.org> Reviewed-by: Olivier Robin <olivierrobin@chromium.org> Cr-Commit-Position: refs/heads/main@{#1517935} NOKEYCHECK=True GitOrigin-RevId: 8fb2e6804aff8dc8b11c5b9153708c52a3d8d43d
diff --git a/BUILD.gn b/BUILD.gn index 87cb6c3..3f0e056 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -414,7 +414,7 @@ public_deps = [ ":metrics" ] deps = [ "//base", - "//components/metrics/dwa", + "//components/metrics/private_metrics", "//content/public/browser", "//extensions/buildflags", "//gpu/config", @@ -641,7 +641,7 @@ "//build:branding_buildflags", "//components/component_updater:test_support", "//components/encrypted_messages:encrypted_message_proto", - "//components/metrics/dwa", + "//components/metrics/private_metrics", "//components/metrics/public/mojom:call_stack_mojo_bindings", "//components/network_time:network_time_test_support", "//components/prefs:test_support",
diff --git a/dwa/BUILD.gn b/dwa/BUILD.gn index 243148e..33ac3d1 100644 --- a/dwa/BUILD.gn +++ b/dwa/BUILD.gn
@@ -2,116 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -component("dwa_recorder") { - sources = [ - "dwa_recorder.cc", - "dwa_recorder.h", - ] - defines = [ "IS_DWA_RECORDER_IMPL" ] - public_deps = [ - "//components/metrics/dwa/mojom", - "//third_party/metrics_proto", - ] - deps = [ "//base" ] -} - -component("private_metrics_recorder") { - sources = [ - "//components/metrics/private_metrics/dkm_recorder.cc", - "//components/metrics/private_metrics/dkm_recorder.h", - ] - defines = [ "IS_PRIVATE_METRICS_RECORDER_IMPL" ] - public_deps = [ - "//components/metrics/private_metrics/mojom", - "//third_party/metrics_proto", - ] - deps = [ "//base" ] -} - -# TODO(crbug.com/433729993): Build dwa static library under private_metrics static library. -static_library("dwa") { - sources = [ - "//components/metrics/private_metrics/data_upload_config_downloader.cc", - "//components/metrics/private_metrics/data_upload_config_downloader.h", - "//components/metrics/private_metrics/dkm_entry_builder.cc", - "//components/metrics/private_metrics/dkm_entry_builder.h", - "//components/metrics/private_metrics/dkm_entry_builder_base.cc", - "//components/metrics/private_metrics/dkm_entry_builder_base.h", - "//components/metrics/private_metrics/private_metrics_pref_names.cc", - "//components/metrics/private_metrics/private_metrics_pref_names.h", - "//components/metrics/private_metrics/private_metrics_reporting_service.cc", - "//components/metrics/private_metrics/private_metrics_reporting_service.h", - "//components/metrics/private_metrics/private_metrics_unsent_log_store_metrics.cc", - "//components/metrics/private_metrics/private_metrics_unsent_log_store_metrics.h", - "dwa_entry_builder.cc", - "dwa_entry_builder.h", - "dwa_entry_builder_base.cc", - "dwa_entry_builder_base.h", - "dwa_pref_names.cc", - "dwa_pref_names.h", - "dwa_recorder_factory_impl.cc", - "dwa_recorder_factory_impl.h", - "dwa_recorder_interface.cc", - "dwa_recorder_interface.h", - "dwa_rotation_scheduler.cc", - "dwa_rotation_scheduler.h", - "dwa_service.cc", - "dwa_service.h", - ] - public_deps = [ - ":dwa_recorder", - ":private_metrics_recorder", - "//components/metrics/dwa/mojom", - "//components/metrics/private_metrics/mojom", - "//third_party/federated_compute:confidential_compute_proto", - "//third_party/metrics_proto", - ] - defines = [ "IS_DWA_IMPL" ] - deps = [ - "//base", - "//build:buildflag_header_h", - "//components/metrics", - "//components/metrics:metrics_pref_names", - "//components/prefs", - "//components/version_info", - "//mojo/public/cpp/bindings", - "//net", - "//services/metrics/public/cpp:metrics_cpp", - "//services/network/public/cpp", - "//third_party/federated_compute:confidential_compute", - "//third_party/oak:oak_proto", - ] -} - -source_set("unit_tests") { - testonly = true - sources = [ - "//components/metrics/private_metrics/data_upload_config_downloader_unittest.cc", - "//components/metrics/private_metrics/dkm_entry_builder_unittest.cc", - "dwa_entry_builder_unittest.cc", - "dwa_recorder_unittest.cc", - "dwa_service_unittest.cc", - ] - deps = [ - ":dwa", - "//base", - "//base/test:test_support", - "//components/metrics", - "//components/metrics:test_support", - "//components/prefs", - "//components/prefs:test_support", - "//services/metrics/public/cpp:metrics_cpp", - "//services/network:test_support", - "//services/network/public/cpp", - "//testing/gmock", - "//testing/gtest", - "//third_party/federated_compute:confidential_compute", - "//third_party/federated_compute:confidential_compute_proto", - "//third_party/metrics_proto", - "//third_party/oak:oak_proto", - ] -} - action("gen_private_metrics_builders") { script = "//tools/metrics/private_metrics/gen_builders.py" @@ -144,8 +34,8 @@ sources = get_target_outputs(":gen_private_metrics_builders") deps = [ - ":dwa", ":gen_private_metrics_builders", "//base", + "//components/metrics/private_metrics", ] }
diff --git a/private_metrics/BUILD.gn b/private_metrics/BUILD.gn new file mode 100644 index 0000000..5f5e299 --- /dev/null +++ b/private_metrics/BUILD.gn
@@ -0,0 +1,113 @@ +# Copyright 2025 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +component("dwa_recorder") { + sources = [ + "//components/metrics/dwa/dwa_recorder.cc", + "//components/metrics/dwa/dwa_recorder.h", + ] + defines = [ "IS_DWA_RECORDER_IMPL" ] + public_deps = [ + "//components/metrics/dwa/mojom", + "//third_party/metrics_proto", + ] + deps = [ "//base" ] +} + +component("private_metrics_recorder") { + sources = [ + "dkm_recorder.cc", + "dkm_recorder.h", + ] + defines = [ "IS_PRIVATE_METRICS_RECORDER_IMPL" ] + public_deps = [ + "//components/metrics/private_metrics/mojom", + "//third_party/metrics_proto", + ] + deps = [ "//base" ] +} + +# TODO(crbug.com/433729993): Build dwa static library under private_metrics static library. +static_library("private_metrics") { + sources = [ + "//components/metrics/dwa/dwa_entry_builder.cc", + "//components/metrics/dwa/dwa_entry_builder.h", + "//components/metrics/dwa/dwa_entry_builder_base.cc", + "//components/metrics/dwa/dwa_entry_builder_base.h", + "//components/metrics/dwa/dwa_pref_names.cc", + "//components/metrics/dwa/dwa_pref_names.h", + "//components/metrics/dwa/dwa_recorder_factory_impl.cc", + "//components/metrics/dwa/dwa_recorder_factory_impl.h", + "//components/metrics/dwa/dwa_recorder_interface.cc", + "//components/metrics/dwa/dwa_recorder_interface.h", + "//components/metrics/dwa/dwa_rotation_scheduler.cc", + "//components/metrics/dwa/dwa_rotation_scheduler.h", + "//components/metrics/dwa/dwa_service.cc", + "//components/metrics/dwa/dwa_service.h", + "data_upload_config_downloader.cc", + "data_upload_config_downloader.h", + "dkm_entry_builder.cc", + "dkm_entry_builder.h", + "dkm_entry_builder_base.cc", + "dkm_entry_builder_base.h", + "private_metrics_pref_names.cc", + "private_metrics_pref_names.h", + "private_metrics_reporting_service.cc", + "private_metrics_reporting_service.h", + "private_metrics_unsent_log_store_metrics.cc", + "private_metrics_unsent_log_store_metrics.h", + ] + public_deps = [ + ":dwa_recorder", + ":private_metrics_recorder", + "//components/metrics/dwa/mojom", + "//components/metrics/private_metrics/mojom", + "//third_party/federated_compute:confidential_compute_proto", + "//third_party/metrics_proto", + ] + defines = [ "IS_DWA_IMPL" ] + deps = [ + "//base", + "//build:buildflag_header_h", + "//components/metrics", + "//components/metrics:metrics_pref_names", + "//components/prefs", + "//components/version_info", + "//mojo/public/cpp/bindings", + "//net", + "//services/metrics/public/cpp:metrics_cpp", + "//services/network/public/cpp", + "//third_party/federated_compute:confidential_compute", + "//third_party/oak:oak_proto", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "//components/metrics/dwa/dwa_entry_builder_unittest.cc", + "//components/metrics/dwa/dwa_recorder_unittest.cc", + "//components/metrics/dwa/dwa_service_unittest.cc", + "data_upload_config_downloader_unittest.cc", + "dkm_entry_builder_unittest.cc", + ] + deps = [ + ":private_metrics", + "//base", + "//base/test:test_support", + "//components/metrics", + "//components/metrics:test_support", + "//components/prefs", + "//components/prefs:test_support", + "//services/metrics/public/cpp:metrics_cpp", + "//services/network:test_support", + "//services/network/public/cpp", + "//testing/gmock", + "//testing/gtest", + "//third_party/federated_compute:confidential_compute", + "//third_party/federated_compute:confidential_compute_proto", + "//third_party/metrics_proto", + "//third_party/oak:oak_proto", + ] +}