Skip to content

DWYU and include-cleaner: host/libs/{audio_connector,avb,command_util,config} #2976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Databean wants to merge 20 commits into from
Open

DWYU and include-cleaner: host/libs/{audio_connector,avb,command_util,config} #2976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4fa9d2a
DWYU for config:config_flag
Databean Aug 5, 2026
43aaaf7
DWYU for config:config_utils
Databean Aug 5, 2026
66c05e0
DWYU for config:cuttlefish_config
Databean Aug 5, 2026
86dcf5c
DWYU for config:data_image
Databean Aug 5, 2026
424a863
DWYU for config:display
Databean Aug 5, 2026
744ec97
DWYU for config:esp
Databean Aug 5, 2026
a8bf530
DWYU for config:build_archive
Databean Aug 5, 2026
915f017
DWYU for config:host_tools_version
Databean Aug 5, 2026
aa49e3e
DWYU for config:instance_nums
Databean Aug 5, 2026
9f70cce
DWYU for config:logging
Databean Aug 5, 2026
1751a6f
DWYU for config:openwrt_args
Databean Aug 5, 2026
e4da9b4
DWYU for config:secure_hals
Databean Aug 5, 2026
9a3fc07
DWYU for config:touchpad
Databean Aug 5, 2026
6434d2a
DWYU for config:media
Databean Aug 5, 2026
c193755
DWYU for config/adb
Databean Aug 5, 2026
cc737dd
DWYU for config/fastboot
Databean Aug 5, 2026
b28c4fe
DWYU and include-cleaner on audio_connector
Databean Aug 5, 2026
de7f524
include-cleaner on avb:parser
Databean Aug 5, 2026
dd6f6b0
include-cleaner on avb/avb
Databean Aug 5, 2026
f1f20ce
include-cleaner on command_util:command_util
Databean Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions base/cvd/cuttlefish/host/libs/audio_connector/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@ cf_cc_library(
"server.h",
"shm_layout.h",
],
depend_on_what_you_use_enabled = False,
include_cleaner_enabled = False,
deps = [
"//cuttlefish/common/libs/fs",
"//cuttlefish/common/libs/utils:cf_endian",
"//libbase",
"@abseil-cpp//absl/log",
"@abseil-cpp//absl/log:check",
],
Expand Down
6 changes: 6 additions & 0 deletions base/cvd/cuttlefish/host/libs/audio_connector/buffers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@

#include "cuttlefish/host/libs/audio_connector/buffers.h"

#include <stdint.h>

#include <utility>

#include "absl/log/check.h"

#include "cuttlefish/host/libs/audio_connector/shm_layout.h"

namespace cuttlefish {

ShmBuffer::ShmBuffer(const virtio_snd_pcm_xfer& header,
Expand Down
5 changes: 4 additions & 1 deletion base/cvd/cuttlefish/host/libs/audio_connector/commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@

#include "cuttlefish/host/libs/audio_connector/commands.h"

#include <stddef.h>
#include <stdint.h>

#include <algorithm>
#include <cstdint>
#include <span>
#include <vector>

#include "absl/log/check.h"
Expand Down
22 changes: 16 additions & 6 deletions base/cvd/cuttlefish/host/libs/audio_connector/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,26 @@

#include "cuttlefish/host/libs/audio_connector/server.h"

#include <fcntl.h>
#include <strings.h>
#include <unistd.h>

#include <stdint.h>
#include <string.h>
#include <sys/mman.h>
#include <sys/socket.h>
#include <sys/types.h>

#include <functional>
#include <memory>
#include <string>
#include <utility>
#include <vector>

#include "absl/log/check.h"
#include "absl/log/log.h"

#include "cuttlefish/common/libs/fs/shared_fd.h"
#include "cuttlefish/host/libs/audio_connector/buffers.h"
#include "cuttlefish/host/libs/audio_connector/commands.h"
#include "cuttlefish/host/libs/audio_connector/shm_layout.h"

namespace cuttlefish {

namespace {
Expand Down Expand Up @@ -440,9 +450,9 @@ bool AudioClientConnection::CmdReply(AudioStatus status, const void* data,
.code = Le32(static_cast<uint32_t>(status)),
};
std::vector<uint8_t> buffer(sizeof(vio_status) + size, 0);
std::memcpy(buffer.data(), &vio_status, sizeof(vio_status));
memcpy(buffer.data(), &vio_status, sizeof(vio_status));
if (data) {
std::memcpy(buffer.data() + sizeof(vio_status), data, size);
memcpy(buffer.data() + sizeof(vio_status), data, size);
}
auto status_sent = control_socket_->Send(buffer.data(), buffer.size(), 0);
if (status_sent < sizeof(vio_status) + size) {
Expand Down
2 changes: 0 additions & 2 deletions base/cvd/cuttlefish/host/libs/avb/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ cf_cc_library(
name = "avb",
srcs = ["avb.cpp"],
hdrs = ["avb.h"],
include_cleaner_enabled = False,
deps = [
"//cuttlefish/common/libs/fs",
"//cuttlefish/common/libs/utils:files",
Expand All @@ -22,7 +21,6 @@ cf_cc_library(
name = "parser",
srcs = ["parser.cc"],
hdrs = ["parser.h"],
include_cleaner_enabled = False,
deps = [
"//cuttlefish/io",
"//cuttlefish/io:read_exact",
Expand Down
5 changes: 4 additions & 1 deletion base/cvd/cuttlefish/host/libs/avb/avb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@
#include "cuttlefish/host/libs/avb/avb.h"

#include <fcntl.h>
#include <stddef.h>
#include <sys/types.h>

#include <memory>
#include <string>
#include <utility>
#include <vector>

#include "cuttlefish/common/libs/fs/shared_fd.h"
#include "cuttlefish/common/libs/utils/files.h"
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/libs/avb/avb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

#pragma once

#include <stdint.h>
#include <sys/types.h>

#include <cstdint>
#include <string>
#include <vector>

Expand Down
4 changes: 4 additions & 0 deletions base/cvd/cuttlefish/host/libs/avb/parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@

#include "cuttlefish/host/libs/avb/parser.h"

#include <stdint.h>

#include <string>
#include <string_view>
#include <utility>
#include <vector>

#include "libavb/libavb.h"

Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/libs/command_util/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ cf_cc_library(
"snapshot_utils.h",
"util.h",
],
include_cleaner_enabled = False,
deps = [
":libcuttlefish_run_cvd_proto",
"//cuttlefish/common/libs/fs",
Expand All @@ -48,5 +47,6 @@ cf_cc_library(
"//cuttlefish/result",
"@abseil-cpp//absl/log",
"@abseil-cpp//absl/strings",
"@jsoncpp",
],
)
13 changes: 9 additions & 4 deletions base/cvd/cuttlefish/host/libs/command_util/snapshot_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,20 @@

#include "cuttlefish/host/libs/command_util/snapshot_utils.h"

#include <unistd.h>
#include <utime.h>
#include <fcntl.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <time.h>

#include <cstdlib>
#include <cstring>
#include <functional>
#include <string>
#include <string_view>
#include <unordered_map>
#include <vector>

#include "absl/log/log.h"
#include "absl/strings/strip.h"
#include "json/value.h"

#include "cuttlefish/common/libs/fs/shared_fd.h"
#include "cuttlefish/common/libs/utils/environment.h"
Expand All @@ -35,6 +39,7 @@
#include "cuttlefish/files/directory_contents.h"
#include "cuttlefish/files/directory_exists.h"
#include "cuttlefish/files/file_exists.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/posix/readlink.h"
#include "cuttlefish/posix/realpath.h"
#include "cuttlefish/posix/symlink.h"
Expand Down
2 changes: 2 additions & 0 deletions base/cvd/cuttlefish/host/libs/command_util/snapshot_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#include <functional>
#include <string>

#include "json/value.h"

#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/result/result.h"

Expand Down
5 changes: 4 additions & 1 deletion base/cvd/cuttlefish/host/libs/command_util/util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@

#include "cuttlefish/host/libs/command_util/util.h"

#include <errno.h>
#include <stdint.h>
#include <sys/time.h>
#include <sys/time.h> // IWYU pragma: keep: timeval
#include <sys/types.h>

#include <optional>
#include <string>
#include <utility>

#include "cuttlefish/common/libs/fs/shared_buf.h"
#include "cuttlefish/common/libs/fs/shared_fd.h"
Expand Down Expand Up @@ -144,6 +146,7 @@ Result<void> WaitForRead(SharedFD monitor_socket, const int timeout_seconds) {
// Perform a select with a timeout to guard against launcher hanging
SharedFDSet read_set;
read_set.Set(monitor_socket);
// NOLINTNEXTLINE(misc-include-cleaner): <sys/time.h>
struct timeval timeout = {timeout_seconds, 0};
int select_result = Select(&read_set, nullptr, nullptr,
timeout_seconds <= 0 ? nullptr : &timeout);
Expand Down
Loading
Loading