Merge "Allow service-media-s in apex" am: 2b7d4e1ba4 am: 0f4f57c874 am: b1df1811a5

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1552047

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f0ef4e0a298d1abe9293a675fdaf8e3bd0d6c98

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",

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{

apex/allowed_deps.txt

@@ -623,6 +623,7 @@ prebuilt_test_framework-sdkextensions(minSdkVersion:(no version))
 resourceobserver_aidl_interface-ndk_platform(minSdkVersion:29)
 s2-geometry-library-java(minSdkVersion:30)
 server_configurable_flags(minSdkVersion:29)
+service-media-s(minSdkVersion:29)
 service-permission(minSdkVersion:current)
 service-statsd(minSdkVersion:current)
 SettingsLibActionBarShadow(minSdkVersion:21)