Skip to content

Conversation

@Databean
Copy link
Member

@Databean Databean commented Jan 2, 2026

This was missed in #1955 .

Bug: b/321795781

@Databean Databean requested a review from 3405691582 January 2, 2026 22:58
@Databean Databean enabled auto-merge January 2, 2026 22:58
Copy link
Collaborator

@3405691582 3405691582 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you want to split some of the include changes into a separate commit -- in the same pr is okay -- so they'll be separated cleanly when rebasing?

Optional, since the changes are a small delta.

@Databean Databean added this pull request to the merge queue Jan 3, 2026
@3405691582
Copy link
Collaborator

Ah, you enabled automerge. No big deal.

@Databean Databean removed this pull request from the merge queue due to a manual request Jan 3, 2026
This was missed in google#1955 .

Changing the log header additionally caused a new unrelated error, which
is also fixed:
```
In file included from allocd/alloc_utils.cpp:16:
allocd/alloc_utils.h:28:10: error: module //allocd:alloc_utils does not depend on a module exporting 'cuttlefish/common/libs/fs/shared_fd.h'
   28 | #include "cuttlefish/common/libs/fs/shared_fd.h"
      |          ^
1 error generated.
```

Bug: b/321795781
@Databean Databean force-pushed the allocd_utils_abseil_log branch from 192b56b to ef521c2 Compare January 3, 2026 00:35
@Databean
Copy link
Member Author

Databean commented Jan 3, 2026

Thanks for reviewing!

Separated into two commits, the first one still additionally removes the shared_fd.h include as it was causing a build error:

In file included from allocd/alloc_utils.cpp:16:
allocd/alloc_utils.h:28:10: error: module //allocd:alloc_utils does not depend on a module exporting 'cuttlefish/common/libs/fs/shared_fd.h'
   28 | #include "cuttlefish/common/libs/fs/shared_fd.h"
      |          ^
1 error generated.

@Databean Databean enabled auto-merge January 3, 2026 00:36
@Databean Databean added this pull request to the merge queue Jan 3, 2026
Merged via the queue into google:main with commit c45bc56 Jan 3, 2026
41 of 42 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants