Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bee1b00 authored by Hyundo Moon's avatar Hyundo Moon
Browse files

Allow service-media-s in apex 

Bug: 175511943
Test: Builds successfully
Change-Id: I5d76087d3c537205e8b8ca837c13ca1aeb641b4c
parent 193ac2eb

android/neverallow.go

+0 −9
Original line number Diff line number Diff line
@@ -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

+0 −13
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -566,6 +566,7 @@ prebuilt_libclang_rt.builtins-i686-android(minSdkVersion:(no version)) 
prebuilt_libclang_rt.builtins-x86_64-android(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)