[AOSP-pick] Parameterize aspect at instantiation #7382
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sellophane
requested review from
ujohnny,
LeFrosch and
agluszak
as code owners
github-actions
bot
added
product: CLion
LeFrosch
requested changes
Feb 28, 2025
Comment on lines
-412
to
-421
| for inc in include.split(","): | ||
| # This is not a valid label, but can be passed to aspect when `directories: .` is set in the projectview | ||
| if (inc == "//"): | ||
| result = True | ||
| break | ||
|
|
||
| inc = Label(inc) | ||
| if _get_repo_name(inc) == repo and _package_prefix_match(package, inc.package): | ||
| result = True | ||
| break |
There was a problem hiding this comment.
I personally prefer this implementation. But of course I'm biased here. I think we should either keep the original implementation or use the AOSP implementation.
There was a problem hiding this comment.
I think the AOSP implementation is better, because it doesn't try to use a comma-delimited string as a makeshift collection.
LeFrosch
reviewed
Mar 4, 2025
Comment on lines
-167
to
-169
| projectDefinition.projectIncludes().stream() | ||
| .map(path -> "//" + path) | ||
| .collect(joining(",")); |
There was a problem hiding this comment.
@odisseus you are right, they are dropping the comma separated collection. In this case I would suggest to drop all my changes and use the AOSP implementation.
sellophane
force-pushed
the
AOSP/2e116b56c18f3c50f832e759537321ed0ba6fb34
branch
from
0fba2f6 to
58a20fe
Compare
This is to unify the test and production flows and make manual testing from the command line tolerable. It should also make the aspect configuration visible in CitC snapshots and aspect builds easily reproducible in users' workspaces. Bug: 327638725 Test: BazelDependencyBuilderTest Change-Id: I4cf4b408097cecc7d324310d98c18ce36900468e AOSP: 2e116b56c18f3c50f832e759537321ed0ba6fb34
sellophane
force-pushed
the
AOSP/2e116b56c18f3c50f832e759537321ed0ba6fb34
branch
from
58a20fe to
64c57c7
Compare
LeFrosch
approved these changes
Mar 4, 2025
github-actions
bot
removed
the
awaiting-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry pick AOSP commit 2e116b56c18f3c50f832e759537321ed0ba6fb34.
This is to unify the test and production flows and make manual testing
from the command line tolerable.
It should also make the aspect configuration visible in CitC snapshots
and aspect builds easily reproducible in users' workspaces.
Bug: 327638725
Test: BazelDependencyBuilderTest
Change-Id: I4cf4b408097cecc7d324310d98c18ce36900468e
AOSP: 2e116b56c18f3c50f832e759537321ed0ba6fb34