Merge "Converters for contributions to systemapi and vendorapi"
diff --git a/android/neverallow.go b/android/neverallow.go
index 00078a0..2745238 100644
--- a/android/neverallow.go
+++ b/android/neverallow.go
@@ -58,6 +58,7 @@
AddNeverAllowRules(createMakefileGoalRules()...)
AddNeverAllowRules(createInitFirstStageRules()...)
AddNeverAllowRules(createProhibitFrameworkAccessRules()...)
+ AddNeverAllowRules(createBp2BuildRules()...)
}
// Add a NeverAllow rule to the set of rules to apply.
@@ -65,6 +66,24 @@
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 createIncludeDirsRules() []Rule {
notInIncludeDir := []string{
"art",
diff --git a/cc/symbolfile/__init__.py b/cc/symbolfile/__init__.py
index 9bf07f2..94c8567 100644
--- a/cc/symbolfile/__init__.py
+++ b/cc/symbolfile/__init__.py
@@ -41,6 +41,7 @@
ALL_ARCHITECTURES = (
Arch('arm'),
Arch('arm64'),
+ Arch('riscv64'),
Arch('x86'),
Arch('x86_64'),
)
diff --git a/fuzz/fuzz_common.go b/fuzz/fuzz_common.go
index eb248bb..5e5769b 100644
--- a/fuzz/fuzz_common.go
+++ b/fuzz/fuzz_common.go
@@ -151,6 +151,8 @@
// If there's a Java fuzzer with JNI, a different version of Jazzer would
// need to be added to the fuzzer package than one without JNI
IsJni *bool `json:"is_jni,omitempty"`
+ // List of modules for monitoring coverage drops in directories (e.g. "libicu")
+ Target_modules []string `json:"target_modules,omitempty"`
}
type FuzzFrameworks struct {