Skip to content
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.

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

[AOSP-pick] Clean up usages of @com_google_protobuf//:protobuf_java #7448

Conversation

LeFrosch
Copy link
Collaborator

Cherry pick AOSP commit 1f25b080153fa75504b01f8bfa9f19389f705590.

STAT (diff to AOSP): 0 insertions(+), 0 deletion(-)

This version of protobuf should only be used for the native implementation
and for common proto definitions.

Test: existing
Bug: none
Change-Id: Id94e6a5b74ef52d5c389e448506e13b2e1bdb002

AOSP: 1f25b080153fa75504b01f8bfa9f19389f705590

This version of protobuf should only be used for the native implementation
and for common proto definitions.

Test: existing
Bug: none
Change-Id: Id94e6a5b74ef52d5c389e448506e13b2e1bdb002

AOSP: 1f25b080153fa75504b01f8bfa9f19389f705590
@github-actions github-actions bot added the awaiting-review Awaiting review from Bazel team on PRs label Mar 10, 2025
@sellophane
Copy link
Collaborator

Are we here just moving deps one line lower?

@LeFrosch
Copy link
Collaborator Author

In the AOSP commit they are switching from
@com_google_protobuf//:protobuf_java
to
@maven//:com.google.protobuf.protobuf-java
but they both map to
@protobuf//:protobuf_java
see
https://github.com/LeFrosch/intellij-aosp-merge/blob/f1d36a536bd70fadfa0f0b65400ed4e1c4c309aa/aosp/_deaosp.py#L62-L64

@sellophane
Copy link
Collaborator

In the AOSP commit they are switching from @com_google_protobuf//:protobuf_java to @maven//:com.google.protobuf.protobuf-java but they both map to @protobuf//:protobuf_java see https://github.com/LeFrosch/intellij-aosp-merge/blob/f1d36a536bd70fadfa0f0b65400ed4e1c4c309aa/aosp/_deaosp.py#L62-L64

Yes, I've check the original commit already, I was just wondering if this change is a good idea, if it doesn't provide any value. But lets have it for consistency sake

@sellophane sellophane merged commit 573de68 into bazelbuild:master Mar 10, 2025
7 checks passed
@github-actions github-actions bot removed the awaiting-review Awaiting review from Bazel team on PRs label Mar 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

2 participants