Reapply "Make the enabled property configurable"
Previously, I had changed some loadhook-appended property structs
to use selects instead of the "target" property struct. This seems
to not be exactly equivalent because "target" properties are merged
with the regular properties later, at the time the arch mutator runs.
With this reapplication, leave those target property structs alone
to avoid breakages, but I'll have to look into what the issue is
with them later.
This reverts commit ed5276f082
.
Ignore-AOSP-First: This cl needs to be in a topic with internal-only projects, will cherrypick to aosp after.
Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: If355d24506e3f117d27b21442a6c02bca3402dc7
This commit is contained in:
@@ -674,13 +674,11 @@ func RegisterComponentsMutator(ctx RegisterMutatorsContext) {
|
||||
// on component modules to be added so that they can depend directly on a prebuilt
|
||||
// module.
|
||||
func componentDepsMutator(ctx BottomUpMutatorContext) {
|
||||
if m := ctx.Module(); m.Enabled() {
|
||||
m.ComponentDepsMutator(ctx)
|
||||
}
|
||||
ctx.Module().ComponentDepsMutator(ctx)
|
||||
}
|
||||
|
||||
func depsMutator(ctx BottomUpMutatorContext) {
|
||||
if m := ctx.Module(); m.Enabled() {
|
||||
if m := ctx.Module(); m.Enabled(ctx) {
|
||||
m.base().baseDepsMutator(ctx)
|
||||
m.DepsMutator(ctx)
|
||||
}
|
||||
|
Reference in New Issue
Block a user