Skip to content

Commit a406fa3

Browse files
committed
Add new cuttlefish-metrics package
Bug: 450053679
1 parent 63e7509 commit a406fa3

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

base/cvd/cuttlefish/package/BUILD.bazel

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,12 @@ package_files(
141141
},
142142
visibility = ["//:android_cuttlefish"],
143143
)
144+
145+
package_files(
146+
name = "metrics",
147+
executable = "cuttlefish-metrics/bin/metrics_transmitter",
148+
package_file_to_src = {
149+
"cuttlefish-metrics/bin/metrics_transmitter": "//cuttlefish/host/commands/metrics:metrics_transmitter",
150+
},
151+
visibility = ["//:android_cuttlefish"],
152+
)

base/debian/control

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,8 @@ Build-Depends: bazel [amd64],
107107
Depends: cuttlefish-base,
108108
Description: May potentially enable new or experimental cuttlefish
109109
features before being enabled by default.
110+
111+
Package: cuttlefish-metrics
112+
Architecture: any
113+
Depends: cuttlefish-base,
114+
Description: Enables metrics transmissions to Google.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/dh-exec
2+
[amd64] cvd/bazel-out/k8-opt/bin/cuttlefish/package/cuttlefish-metrics /usr/lib
3+
[arm64] cvd/bazel-out/aarch64-opt/bin/cuttlefish/package/cuttlefish-metrics /usr/lib

base/debian/rules

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ endif
5555

5656
cuttlefish_common := debian/cuttlefish-base/usr/lib/cuttlefish-common
5757
cuttlefish_integration := debian/cuttlefish-integration/usr/bin
58+
cuttlefish_metrics := debian/cuttlefish-metrics/usr/lib/cuttlefish-metrics
5859

5960
disk_cache_arg :=
6061
ifneq ($(strip ${BAZEL_DISK_CACHE_DIR}),)
@@ -78,7 +79,7 @@ override_dh_installinit:
7879
# the `--workspace_status_command` flag path depends on the current working directory of base/cvd
7980
.PHONY: override_dh_auto_build
8081
override_dh_auto_build:
81-
cd cvd && bazel build ${remote_cache_arg} ${disk_cache_arg} ${compilation_mode} ${conlyopts} ${copts} ${cxxopts} ${linkopts} -c opt 'cuttlefish/package:cvd' cuttlefish/package:defaults --spawn_strategy=local --workspace_status_command=../stamp_helper.sh --build_tag_filters=-clang-tidy
82+
cd cvd && bazel build ${remote_cache_arg} ${disk_cache_arg} ${compilation_mode} ${conlyopts} ${copts} ${cxxopts} ${linkopts} -c opt 'cuttlefish/package:cvd' 'cuttlefish/package:defaults' 'cuttlefish/package:metrics' --spawn_strategy=local --workspace_status_command=../stamp_helper.sh --build_tag_filters=-clang-tidy
8283
dh_auto_build
8384

8485
# Only generate optimized DWARF if debug is enabled
@@ -99,6 +100,8 @@ override_dh_install:
99100
rm -rf ${cuttlefish_common}/bin/cvd.runfiles*
100101
rm -rf ${cuttlefish_integration}/defaults.repo_mapping
101102
rm -rf ${cuttlefish_integration}/defaults.runfiles*
103+
rm -rf ${cuttlefish_metrics}/bin/cvd.repo_mapping
104+
rm -rf ${cuttlefish_metrics}/bin/cvd.runfiles*
102105

103106
# Repair output files bazel actions made executable
104107
.PHONY: override_dh_fixperms

0 commit comments

Comments
 (0)