Merge "Remove neverallow rules for framework-mediaprovider" into rvc-dev

This commit is contained in:
Anton Hansson
2020-04-02 11:07:17 +00:00
committed by Android (Google) Code Review
2 changed files with 0 additions and 22 deletions

View File

@@ -52,7 +52,6 @@ func init() {
AddNeverAllowRules(createTrebleRules()...) AddNeverAllowRules(createTrebleRules()...)
AddNeverAllowRules(createLibcoreRules()...) AddNeverAllowRules(createLibcoreRules()...)
AddNeverAllowRules(createMediaRules()...) AddNeverAllowRules(createMediaRules()...)
AddNeverAllowRules(createMediaProviderRules()...)
AddNeverAllowRules(createJavaDeviceForHostRules()...) AddNeverAllowRules(createJavaDeviceForHostRules()...)
} }
@@ -161,14 +160,6 @@ func createMediaRules() []Rule {
} }
} }
func createMediaProviderRules() []Rule {
return []Rule{
NeverAllow().
With("libs", "framework-mediaprovider").
Because("framework-mediaprovider includes private APIs. Use framework_mediaprovider_stubs instead."),
}
}
func createJavaDeviceForHostRules() []Rule { func createJavaDeviceForHostRules() []Rule {
javaDeviceForHostProjectsWhitelist := []string{ javaDeviceForHostProjectsWhitelist := []string{
"external/guava", "external/guava",

View File

@@ -202,19 +202,6 @@ var neverallowTests = []struct {
"updatable-media includes private APIs. Use updatable_media_stubs instead.", "updatable-media includes private APIs. Use updatable_media_stubs instead.",
}, },
}, },
{
name: "dependency on framework-mediaprovider",
fs: map[string][]byte{
"Android.bp": []byte(`
java_library {
name: "needs_framework_mediaprovider",
libs: ["framework-mediaprovider"],
}`),
},
expectedErrors: []string{
"framework-mediaprovider includes private APIs. Use framework_mediaprovider_stubs instead.",
},
},
{ {
name: "java_device_for_host", name: "java_device_for_host",
fs: map[string][]byte{ fs: map[string][]byte{