Support auto gen module type matching in neverallow am: d546507c3b am: d67d118639
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3387581
Change-Id: I90679e85f6885e32bb88271ac08abe4692f379f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/neverallow.go b/android/neverallow.go
index 5575879..d590d8e 100644
--- a/android/neverallow.go
+++ b/android/neverallow.go
@@ -706,6 +706,9 @@
}
func (r *rule) appliesToModuleType(moduleType string) bool {
+ // Remove prefix for auto-generated modules
+ moduleType = strings.TrimSuffix(moduleType, "__loadHookModule")
+ moduleType = strings.TrimSuffix(moduleType, "__bottomUpMutatorModule")
return (len(r.moduleTypes) == 0 || InList(moduleType, r.moduleTypes)) && !InList(moduleType, r.unlessModuleTypes)
}