diff --git a/android/neverallow.go b/android/neverallow.go index 031b3f411..7455e6a78 100644 --- a/android/neverallow.go +++ b/android/neverallow.go @@ -51,7 +51,6 @@ var neverallows = []Rule{} func init() { AddNeverAllowRules(createIncludeDirsRules()...) AddNeverAllowRules(createTrebleRules()...) - AddNeverAllowRules(createMediaRules()...) AddNeverAllowRules(createJavaDeviceForHostRules()...) AddNeverAllowRules(createCcSdkVariantRules()...) AddNeverAllowRules(createUncompressDexRules()...) @@ -132,14 +131,6 @@ func createTrebleRules() []Rule { } } -func createMediaRules() []Rule { - return []Rule{ - NeverAllow(). - With("libs", "updatable-media"). - Because("updatable-media includes private APIs. Use updatable_media_stubs instead."), - } -} - func createJavaDeviceForHostRules() []Rule { javaDeviceForHostProjectsAllowedList := []string{ "external/guava", diff --git a/android/neverallow_test.go b/android/neverallow_test.go index 8c7a5385d..b761065ca 100644 --- a/android/neverallow_test.go +++ b/android/neverallow_test.go @@ -189,19 +189,6 @@ var neverallowTests = []struct { }`), }, }, - { - name: "dependency on updatable-media", - fs: map[string][]byte{ - "Android.bp": []byte(` - java_library { - name: "needs_updatable_media", - libs: ["updatable-media"], - }`), - }, - expectedErrors: []string{ - "updatable-media includes private APIs. Use updatable_media_stubs instead.", - }, - }, { name: "java_device_for_host", fs: map[string][]byte{ diff --git a/apex/allowed_deps.txt b/apex/allowed_deps.txt index 1d2de985e..d4ef1050c 100644 --- a/apex/allowed_deps.txt +++ b/apex/allowed_deps.txt @@ -573,6 +573,7 @@ prebuilt_libclang_rt.builtins-x86_64-android(minSdkVersion:(no version)) prebuilt_libunwind(minSdkVersion:(no version)) prebuilt_test_framework-sdkextensions(minSdkVersion:(no version)) server_configurable_flags(minSdkVersion:29) +service-media-s(minSdkVersion:29) service-permission(minSdkVersion:current) service-statsd(minSdkVersion:current) SettingsLibActionBarShadow(minSdkVersion:21)