Merge "Blanket disallow bp2build_available: true."

android/neverallow.go

@@ -58,7 +58,7 @@ func init() {
 	AddNeverAllowRules(createMakefileGoalRules()...)
 	AddNeverAllowRules(createInitFirstStageRules()...)
 	AddNeverAllowRules(createProhibitFrameworkAccessRules()...)
-	AddNeverAllowRules(createBp2BuildRules()...)
+	AddNeverAllowRules(createBp2BuildRule())
 }
 
 // Add a NeverAllow rule to the set of rules to apply.
@@ -66,22 +66,11 @@ func AddNeverAllowRules(rules ...Rule) {
 	neverallows = append(neverallows, rules...)
 }
 
-func createBp2BuildRules() []Rule {
-	rules := []Rule{}
-	bp2buildAvailableAllowedDirs := []string{
-		// Can we just allowlist these modules in allowlists.go?
-		"bionic/libc",
-	}
-
-	for _, dir := range bp2buildAvailableAllowedDirs {
-		rule := NeverAllow().
-			With("bazel_module.bp2build_available", "true").
-			NotIn(dir).
-			Because("disallowed usages of bp2build_available for custom conversion")
-		rules = append(rules, rule)
-	}
-
-	return rules
+func createBp2BuildRule() Rule {
+	return NeverAllow().
+		With("bazel_module.bp2build_available", "true").
+		Because("setting bp2build_available in Android.bp is not " +
+			"supported for custom conversion, use allowlists.go instead.")
 }
 
 func createIncludeDirsRules() []Rule {