Revert "Set the appropriate deps property for the soong generated fs modules"
This reverts commit dc6492f01bbfb4a0f3e10efe6fa8e7cb5a876982.
Reason for revert: Breaking targets in post submit
Change-Id: I50e80f1f6634db6cec42aba7f2262275b6ec8b88
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go
index 7d3b8e1..1e816a7 100644
--- a/filesystem/filesystem.go
+++ b/filesystem/filesystem.go
@@ -145,10 +145,6 @@
Unchecked_module *bool `blueprint:"mutated"`
Erofs ErofsProperties
-
- // Determines if the module is auto-generated from Soong or not. If the module is
- // auto-generated, its deps are exempted from visibility enforcement.
- Is_auto_generated *bool
}
// Additional properties required to generate erofs FS partitions.
@@ -183,29 +179,13 @@
android.InitDefaultableModule(module)
}
-type depTag struct {
+var dependencyTag = struct {
blueprint.BaseDependencyTag
android.PackagingItemAlwaysDepTag
-}
-
-var dependencyTag = depTag{}
-
-type depTagWithVisibilityEnforcementBypass struct {
- depTag
-}
-
-var _ android.ExcludeFromVisibilityEnforcementTag = (*depTagWithVisibilityEnforcementBypass)(nil)
-
-func (t depTagWithVisibilityEnforcementBypass) ExcludeFromVisibilityEnforcement() {}
-
-var dependencyTagWithVisibilityEnforcementBypass = depTagWithVisibilityEnforcementBypass{}
+}{}
func (f *filesystem) DepsMutator(ctx android.BottomUpMutatorContext) {
- if proptools.Bool(f.properties.Is_auto_generated) {
- f.AddDeps(ctx, dependencyTagWithVisibilityEnforcementBypass)
- } else {
- f.AddDeps(ctx, dependencyTag)
- }
+ f.AddDeps(ctx, dependencyTag)
}
type fsType int