openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7401a60614c1c9fdd20158ee52f7e83a7fbe1c73
This commit is contained in:
Hyundo Moon 2021-01-21 16:00:31 +00:00 committed by Automerger Merge Worker
parent 67c3e24f07 0f4f57c874
commit b1df1811a5
3 changed files with 1 additions and 22 deletions
Show Stats 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

@ -573,6 +573,7 @@ prebuilt_libclang_rt.builtins-x86_64-android(minSdkVersion:(no version))
prebuilt_libunwind(minSdkVersion:(no version)) prebuilt_libunwind(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)