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/android/neverallow.go b/android/neverallow.go
index 600175d..e93763b 100644
--- a/android/neverallow.go
+++ b/android/neverallow.go
@@ -60,7 +60,6 @@
AddNeverAllowRules(createCcStubsRule())
AddNeverAllowRules(createProhibitHeaderOnlyRule())
AddNeverAllowRules(createLimitNdkExportRule()...)
- AddNeverAllowRules(createFilesystemIsAutoGeneratedRule())
}
// Add a NeverAllow rule to the set of rules to apply.
@@ -276,14 +275,6 @@
}
}
-func createFilesystemIsAutoGeneratedRule() Rule {
- return NeverAllow().
- NotIn("build/soong/fsgen").
- ModuleType("filesystem", "android_system_image").
- WithMatcher("is_auto_generated", isSetMatcherInstance).
- Because("is_auto_generated property is only allowed for filesystem modules in build/soong/fsgen directory")
-}
-
func neverallowMutator(ctx BottomUpMutatorContext) {
m, ok := ctx.Module().(Module)
if !ok {
diff --git a/android/neverallow_test.go b/android/neverallow_test.go
index caec8c7..192c924 100644
--- a/android/neverallow_test.go
+++ b/android/neverallow_test.go
@@ -359,21 +359,6 @@
`headers_only can only be used for generating framework-minus-apex headers for non-updatable modules`,
},
},
- // Test for the rule restricting use of is_auto_generated
- {
- name: `"is_auto_generated" outside allowed directory`,
- fs: map[string][]byte{
- "a/b/Android.bp": []byte(`
- filesystem {
- name: "baaz",
- is_auto_generated: true,
- }
- `),
- },
- expectedErrors: []string{
- `is_auto_generated property is only allowed for filesystem modules in build/soong/fsgen directory`,
- },
- },
}
var prepareForNeverAllowTest = GroupFixturePreparers(
@@ -382,7 +367,6 @@
ctx.RegisterModuleType("java_library", newMockJavaLibraryModule)
ctx.RegisterModuleType("java_library_host", newMockJavaLibraryModule)
ctx.RegisterModuleType("java_device_for_host", newMockJavaLibraryModule)
- ctx.RegisterModuleType("filesystem", newMockFilesystemModule)
}),
)
diff --git a/android/visibility_test.go b/android/visibility_test.go
index 277be0f..1a2eeca 100644
--- a/android/visibility_test.go
+++ b/android/visibility_test.go
@@ -2098,9 +2098,8 @@
}
type mockFilesystemModuleProperties struct {
- Partition_type *string
- Deps []string
- Is_auto_generated *bool
+ Partition_type *string
+ Deps []string
}
type mockFilesystemModule struct {