StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow service-media-s in apex

Browse Source 
Bug: 175511943
Test: Builds successfully
Change-Id: I5d76087d3c537205e8b8ca837c13ca1aeb641b4c
This commit is contained in:
Hyundo Moon
2021-01-15 20:04:29 +09:00
parent 193ac2eb96
commit 8bee1b00ea
3 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android/neverallow.go
View File

@@ -51,7 +51,6 @@ var neverallows = []Rule{}
func init() { func init() {
AddNeverAllowRules(createIncludeDirsRules()...) AddNeverAllowRules(createIncludeDirsRules()...)
AddNeverAllowRules(createTrebleRules()...) AddNeverAllowRules(createTrebleRules()...)
AddNeverAllowRules(createMediaRules()...)
AddNeverAllowRules(createJavaDeviceForHostRules()...) AddNeverAllowRules(createJavaDeviceForHostRules()...)
AddNeverAllowRules(createCcSdkVariantRules()...) AddNeverAllowRules(createCcSdkVariantRules()...)
AddNeverAllowRules(createUncompressDexRules()...) 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 { func createJavaDeviceForHostRules() []Rule {
javaDeviceForHostProjectsAllowedList := []string{ javaDeviceForHostProjectsAllowedList := []string{
"external/guava", "external/guava",

13
android/neverallow_test.go
View File

@@ -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", name: "java_device_for_host",
fs: map[string][]byte{ fs: map[string][]byte{

1
apex/allowed_deps.txt
View File

@@ -566,6 +566,7 @@ prebuilt_libclang_rt.builtins-i686-android(minSdkVersion:(no version))
prebuilt_libclang_rt.builtins-x86_64-android(minSdkVersion:(no version)) prebuilt_libclang_rt.builtins-x86_64-android(minSdkVersion:(no version))
prebuilt_test_framework-sdkextensions(minSdkVersion:(no version)) prebuilt_test_framework-sdkextensions(minSdkVersion:(no version))
server_configurable_flags(minSdkVersion:29) server_configurable_flags(minSdkVersion:29)
service-media-s(minSdkVersion:29)
service-permission(minSdkVersion:current) service-permission(minSdkVersion:current)
service-statsd(minSdkVersion:current) service-statsd(minSdkVersion:current)
SettingsLibActionBarShadow(minSdkVersion:21) SettingsLibActionBarShadow(minSdkVersion:21)